]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
authorDavid S. Miller <davem@nuts.davemloft.net>
Fri, 13 Feb 2004 13:38:25 +0000 (05:38 -0800)
committerDavid S. Miller <davem@nuts.davemloft.net>
Fri, 13 Feb 2004 13:38:25 +0000 (05:38 -0800)
into nuts.davemloft.net:/disk1/BK/sctp-2.6


Trivial merge