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

Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

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

2013-01-15 15:05:59 -05:00

..

associola.c

sctp: Add RCU protection to assoc->transport_addr_list

2012-12-07 14:15:04 -05: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: fix -ENOMEM result with invalid user space pointer in sendto() syscall

2012-11-28 11:11:17 -05: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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

input.c

sctp: fix a typo in prototype of __sctp_rcv_lookup()

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

inqueue.c

sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call

2012-12-03 13:32:15 -05:00

ipv6.c

sctp: fix CONFIG_SCTP_DBG_MSG=y null pointer dereference in sctp_v6_get_dst()

2012-11-30 12:21:27 -05:00

Kconfig

sctp: fix Kconfig bug in default cookie hmac selection

2013-01-07 09:27:06 -08: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

sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call

2012-12-03 13:32:15 -05:00

outqueue.c

sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call

2012-12-03 13:32:15 -05:00

primitive.c

sctp: Push struct net down to sctp_chunk_event_lookup

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

probe.c

sctp: jsctp_sf_eat_sack: fix jprobes function signature mismatch

2012-12-15 17:14:39 -08:00

proc.c

sctp: Add RCU protection to assoc->transport_addr_list

2012-12-07 14:15:04 -05:00

protocol.c

sctp: make sctp_addr_wq_timeout_handler static

2012-12-28 20:32:36 -08:00

sm_make_chunk.c

sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call

2012-12-03 13:32:15 -05:00

sm_sideeffect.c

sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call

2012-12-03 13:32:15 -05:00

sm_statefuns.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

sm_statetable.c

sctp: Make sysctl tunables per net

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

socket.c

sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call

2012-12-03 13:32:15 -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: Add RCU protection to assoc->transport_addr_list

2012-12-07 14:15:04 -05:00

tsnmap.c

sctp: use bitmap_weight

2012-11-17 22:01:18 -05: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