]> git.hungrycats.org Git - linux/commit
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)
commitc54c4df5211e0c106cca06f4b74faf8024a63e4c
tree948abd1edc3cc08ec029a45d7791478e06e13f4b
parentd1c0dfc84a8d1a97db4bf3fc5f67c0fa6e6cd5ec
parent307be3f0fe50430a0166b35d5cf33ee967f95d50
Merge davem@nuts.davemloft.net:/disk1/BK/sctp-2.6
into kernel.bkbits.net:/home/davem/sctp-2.6