]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
authorDavid S. Miller <davem@nuts.davemloft.net>
Wed, 5 May 2004 12:29:02 +0000 (05:29 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Wed, 5 May 2004 12:29:02 +0000 (05:29 -0700)
into nuts.davemloft.net:/disk1/BK/net-2.6


Trivial merge