]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
authorDavid S. Miller <davem@nuts.davemloft.net>
Mon, 9 Feb 2004 04:23:32 +0000 (20:23 -0800)
committerDavid S. Miller <davem@nuts.davemloft.net>
Mon, 9 Feb 2004 04:23:32 +0000 (20:23 -0800)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
include/net/sctp/structs.h

Simple merge