]> git.hungrycats.org Git - linux/commitdiff
Merge nuts.ninka.net:/home/davem/src/BK/sctp-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Oct 2002 10:54:41 +0000 (03:54 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Oct 2002 10:54:41 +0000 (03:54 -0700)
into nuts.ninka.net:/home/davem/src/BK/net-2.5


Trivial merge