]> git.neil.brown.name Git - history.git/commitdiff
Merge davem@nuts.davemloft.net:/disk1/BK/sctp-2.6
authorDavid S. Miller <davem@kernel.bkbits.net>
Fri, 13 Feb 2004 14:13:57 +0000 (06:13 -0800)
committerDavid S. Miller <davem@kernel.bkbits.net>
Fri, 13 Feb 2004 14:13:57 +0000 (06:13 -0800)
into kernel.bkbits.net:/home/davem/sctp-2.6


Trivial merge