David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
auth.h	sctp: Use shash	2016-01-27 20:36:15 +08:00
checksum.h	include/net/: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
command.h	sctp: handle association restarts when the socket is closed.	2014-10-06 00:21:45 -04:00
constants.h	net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY	2014-07-22 13:32:11 -07:00
sctp.h	sctp: export some apis or variables for sctp_diag and reuse some for proc	2016-04-15 17:29:36 -04:00
sm.h	sctp: allow sctp_transmit_packet and others to use gfp	2016-03-13 22:29:07 -04:00
structs.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
tsnmap.h	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
ulpevent.h	net: sctp: implement rfc6458, 5.3.6. SCTP_NXTINFO cmsg support	2014-07-16 14:40:03 -07:00
ulpqueue.h	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00