Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work

author David S. Miller <davem@nuts.ninka.net>

Mon, 19 Jan 2004 13:05:07 +0000 (05:05 -0800)

committer David S. Miller <davem@nuts.ninka.net>

Mon, 19 Jan 2004 13:05:07 +0000 (05:05 -0800)
author David S. Miller <davem@nuts.ninka.net>
Mon, 19 Jan 2004 13:05:07 +0000 (05:05 -0800)
committer David S. Miller <davem@nuts.ninka.net>
Mon, 19 Jan 2004 13:05:07 +0000 (05:05 -0800)
diff --cc include/linux/sysctl.h
Simple merge
diff --cc net/sctp/socket.c
Simple merge
author	David S. Miller <davem@nuts.ninka.net>
	Mon, 19 Jan 2004 13:05:07 +0000 (05:05 -0800)
committer	David S. Miller <davem@nuts.ninka.net>
	Mon, 19 Jan 2004 13:05:07 +0000 (05:05 -0800)
		1	2
include/linux/sysctl.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	patch \|	diff1 \|	diff2 \|	blob \| history