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
auth.c
bind_addr.c
chunk.c
command.c
debug.c
endpointola.c
input.c
inqueue.c
ipv6.c
Kconfig	sctp: Make hmac algorithm selection for cookie generation dynamic	2012-10-26 02:22:18 -04:00
Makefile
objcnt.c
output.c
outqueue.c	sctp: check src addr when processing SACK to update transport state	2012-10-04 15:53:48 -04:00
primitive.c
probe.c
proc.c
protocol.c	sctp: Make hmac algorithm selection for cookie generation dynamic	2012-10-26 02:22:18 -04:00
sm_make_chunk.c
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
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
ssnmap.c
sysctl.c	sctp: Make hmac algorithm selection for cookie generation dynamic	2012-10-26 02:22:18 -04:00
transport.c
tsnmap.c
ulpevent.c
ulpqueue.c	sctp: Clean up type-punning in sctp_cmd_t union	2012-11-03 14:54:55 -04:00