David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
associola.c	net: sctp: fix panic on duplicate ASCONF chunks	2014-10-14 12:46:22 -04:00
auth.c	net: sctp: fix memory leak in auth key management	2014-11-11 15:19:11 -05:00
bind_addr.c
chunk.c
debug.c
endpointola.c
input.c	sctp: Change sctp to implement csum_levels	2014-08-29 20:41:11 -07:00
inqueue.c	net: sctp: fix remote memory pressure from excessive queueing	2014-10-14 12:46:22 -04:00
ipv6.c
Kconfig
Makefile
objcnt.c
output.c
outqueue.c
primitive.c
probe.c
proc.c	sctp: replace seq_printf with seq_puts	2014-10-30 19:40:16 -04:00
protocol.c	Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-10 07:26:02 -04:00
sm_make_chunk.c	net: sctp: fix NULL pointer dereference in af->from_addr_param on malformed packet	2014-11-11 15:19:10 -05:00
sm_sideeffect.c
sm_statefuns.c	net: sctp: fix remote memory pressure from excessive queueing	2014-10-14 12:46:22 -04:00
sm_statetable.c
socket.c	net: Add and use skb_copy_datagram_msg() helper.	2014-11-05 16:46:40 -05:00
ssnmap.c
sysctl.c
transport.c
tsnmap.c
ulpevent.c
ulpqueue.c	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00