Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

author David S. Miller <davem@davemloft.net>

Sun, 20 Mar 2016 01:05:24 +0000 (21:05 -0400)

committer David S. Miller <davem@davemloft.net>

Sun, 20 Mar 2016 01:05:24 +0000 (21:05 -0400)
author David S. Miller <davem@davemloft.net>
Sun, 20 Mar 2016 01:05:24 +0000 (21:05 -0400)
committer David S. Miller <davem@davemloft.net>
Sun, 20 Mar 2016 01:05:24 +0000 (21:05 -0400)
diff --cc include/net/sctp/structs.h
Simple merge
diff --cc net/sctp/sm_make_chunk.c
Simple merge
diff --cc net/sctp/socket.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Sun, 20 Mar 2016 01:05:24 +0000 (21:05 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sun, 20 Mar 2016 01:05:24 +0000 (21:05 -0400)
		1	2
include/net/sctp/structs.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_make_chunk.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	patch \|	diff1 \|	diff2 \|	blob \| history