David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-11-10 18:32:51 -05:00

..

associola.c

sctp: Make sysctl tunables per net

2012-08-14 23:32:16 -07:00

auth.c

sctp: fix bogus if statement in sctp_auth_recv_cid()

2012-08-16 13:36:29 -07:00

bind_addr.c

sctp: Make sysctl tunables per net

2012-08-14 23:32:16 -07:00

chunk.c

sctp: Make the mib per network namespace

2012-08-14 23:30:36 -07:00

command.c

[SCTP]: Remove sctp_add_cmd_sf wrapper bloat

2008-03-27 17:54:29 -07:00

debug.c

sctp: remove completely unsed EMPTY state

2011-04-20 01:51:03 -07:00

endpointola.c

sctp: Make sysctl tunables per net

2012-08-14 23:32:16 -07:00

input.c

sctp: fix a typo in prototype of __sctp_rcv_lookup()

2012-10-04 15:53:48 -04:00

inqueue.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

ipv6.c

sctp: Make the mib per network namespace

2012-08-14 23:30:36 -07:00

Kconfig

sctp: Make hmac algorithm selection for cookie generation dynamic

2012-10-26 02:22:18 -04:00

Makefile

sctp: implement sctp association probing module

2010-04-30 22:41:09 -04:00

objcnt.c

sctp: Make the proc files per network namespace.

2012-08-14 23:29:53 -07:00

output.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-09-15 11:43:53 -04:00

outqueue.c

sctp: check src addr when processing SACK to update transport state

2012-10-04 15:53:48 -04:00

primitive.c

sctp: Push struct net down to sctp_chunk_event_lookup

2012-08-14 23:30:37 -07:00

probe.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-10-23 11:47:02 -07:00

proc.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-08-24 18:54:37 -04:00

protocol.c

sctp: Make hmac algorithm selection for cookie generation dynamic

2012-10-26 02:22:18 -04:00

sm_make_chunk.c

sctp: Make sysctl tunables per net

2012-08-14 23:32:16 -07:00

sm_sideeffect.c

sctp: Clean up type-punning in sctp_cmd_t union

2012-11-03 14:54:55 -04:00

sm_statefuns.c

sctp: check src addr when processing SACK to update transport state

2012-10-04 15:53:48 -04:00

sm_statetable.c

sctp: Make sysctl tunables per net

2012-08-14 23:32:16 -07:00

socket.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-10 18:32:51 -05:00

ssnmap.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sysctl.c

sctp: Make hmac algorithm selection for cookie generation dynamic

2012-10-26 02:22:18 -04:00

transport.c

sctp: Make sysctl tunables per net

2012-08-14 23:32:16 -07:00

tsnmap.c

sctp: be more restrictive in transport selection on bundled sacks

2012-06-30 22:44:35 -07:00

ulpevent.c

netvm: prevent a stream-specific deadlock

2012-07-31 18:42:47 -07:00

ulpqueue.c

sctp: Clean up type-punning in sctp_cmd_t union

2012-11-03 14:54:55 -04:00