David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/main.c net/packet/af_packet.c Both conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-24 02:58:51 -07:00
..
Kconfig	net: sctp: get rid of SCTP_DBG_TSNS entirely	2013-07-02 00:08:03 -07:00
Makefile	net: sctp: Inline the functions from command.c	2014-07-08 14:38:48 -07:00
associola.c	net: sctp: Deletion of an unnecessary check before the function call "kfree"	2015-02-02 19:29:43 -08:00
auth.c	sctp: allow authenticating DATA chunks that are bundled with COOKIE_ECHO	2015-06-12 14:18:20 -07:00
bind_addr.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
chunk.c	switch sctp_user_addto_chunk() and sctp_datamsg_from_user() to passing iov_iter	2014-11-24 05:16:40 -05:00
debug.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
endpointola.c	net: sctp: migrate most recently used transport to ktime	2014-06-11 12:23:17 -07:00
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	ipv6: Add rt6_get_cookie() function	2015-05-25 13:25:34 -04:00
objcnt.c	sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar	2013-12-26 13:47:47 -05:00
output.c	net: sctp: use MAX_HEADER for headroom reserve in output path	2014-12-09 13:24:03 -05:00
outqueue.c	net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY	2014-07-22 13:32:11 -07:00
primitive.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
probe.c	sctp: loading sctp when load sctp_probe	2013-12-16 20:04:27 -05:00
proc.c	sctp: replace seq_printf with seq_puts	2014-10-30 19:40:16 -04:00
protocol.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
sm_make_chunk.c	net: sctp: fix passing wrong parameter header to param_type2af in sctp_process_param	2015-01-30 17:45:23 -08:00
sm_sideeffect.c	net: sctp: Don't transition to PF state when transport has exhausted 'Path.Max.Retrans'.	2014-04-27 23:41:14 -04:00
sm_statefuns.c	net: sctp: fix remote memory pressure from excessive queueing	2014-10-14 12:46:22 -04:00
sm_statetable.c	sctp: fix checkpatch errors with indent	2013-12-26 13:47:48 -05:00
socket.c	sctp: fix ASCONF list handling	2015-06-14 12:55:49 -07:00
ssnmap.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
sysctl.c	sctp: avoid to repeatedly declare external variables	2015-03-25 11:40:16 -04:00
transport.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
tsnmap.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
ulpevent.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
ulpqueue.c	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00