]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-lksctp.bkbits.net/lksctp-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Thu, 12 Jun 2003 07:52:02 +0000 (00:52 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Thu, 12 Jun 2003 07:52:02 +0000 (00:52 -0700)
into nuts.ninka.net:/home/davem/src/BK/sctp-2.5


Trivial merge