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

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

Fri, 4 Apr 2003 08:56:38 +0000 (00:56 -0800)

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

Fri, 4 Apr 2003 08:56:38 +0000 (00:56 -0800)
author David S. Miller <davem@nuts.ninka.net>
Fri, 4 Apr 2003 08:56:38 +0000 (00:56 -0800)
committer David S. Miller <davem@nuts.ninka.net>
Fri, 4 Apr 2003 08:56:38 +0000 (00:56 -0800)
diff --cc net/sctp/ipv6.c
Simple merge
diff --cc net/sctp/protocol.c
Simple merge
author	David S. Miller <davem@nuts.ninka.net>
	Fri, 4 Apr 2003 08:56:38 +0000 (00:56 -0800)
committer	David S. Miller <davem@nuts.ninka.net>
	Fri, 4 Apr 2003 08:56:38 +0000 (00:56 -0800)
		1	2
net/sctp/ipv6.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sctp/protocol.c	patch \|	diff1 \|	diff2 \|	blob \| history