]> git.neil.brown.name Git - history.git/commitdiff
Merge nuts.ninka.net:/home/davem/src/BK/sctp-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Fri, 4 Oct 2002 11:12:31 +0000 (04:12 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 4 Oct 2002 11:12:31 +0000 (04:12 -0700)
into nuts.ninka.net:/home/davem/src/BK/net-2.5


Trivial merge