David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
associola.c	net: sctp: remove NULL check in sctp_assoc_update_retran_path	2014-03-13 13:23:52 -04:00
auth.c	sctp: fix checkpatch errors with open brace '{' and trailing statements	2013-12-26 13:47:48 -05:00
bind_addr.c
chunk.c
command.c
debug.c
endpointola.c	sctp: remove macros sctp_local_bh_{disable|enable}	2014-01-21 18:40:40 -08:00
input.c	sctp: remove macros sctp_bh_[un]lock_sock	2014-01-21 18:41:36 -08:00
inqueue.c
ipv6.c	net: sctp: fix initialization of local source address on accepted ipv6 sockets	2014-02-06 21:18:06 -08:00
Kconfig
Makefile
objcnt.c
output.c	sctp: move skb_dst_set() a bit downwards in sctp_packet_transmit()	2013-12-31 14:31:44 -05:00
outqueue.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
primitive.c
probe.c
proc.c	sctp: remove macros sctp_local_bh_{disable|enable}	2014-01-21 18:40:40 -08:00
protocol.c	sctp: remove macros sctp_bh_[un]lock_sock	2014-01-21 18:41:36 -08:00
sm_make_chunk.c	net: sctp: fix skb leakage in COOKIE ECHO path of chunk->auth_chunk	2014-03-05 20:40:25 -05:00
sm_sideeffect.c	net: sctp: Potentially-Failed state should not be reached from unconfirmed state	2014-02-20 13:24:56 -05:00
sm_statefuns.c	net: sctp: fix skb leakage in COOKIE ECHO path of chunk->auth_chunk	2014-03-05 20:40:25 -05:00
sm_statetable.c
socket.c	net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode	2014-02-18 16:06:48 -05:00
ssnmap.c
sysctl.c	sctp: optimize the sctp_sysctl_net_register	2014-02-13 17:08:29 -05:00
transport.c	net: remove unnecessary return's	2014-02-13 18:33:38 -05:00
tsnmap.c
ulpevent.c	net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer	2014-02-17 00:16:56 -05:00
ulpqueue.c	sctp: fix checkpatch errors with open brace '{' and trailing statements	2013-12-26 13:47:48 -05:00