]> git.hungrycats.org Git - linux/commit
Merge nuts.ninka.net:/home/davem/src/BK/sctp-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Jul 2003 18:32:18 +0000 (11:32 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Jul 2003 18:32:18 +0000 (11:32 -0700)
commit596821205fe118ae88d24e51d659aed1c119e8e4
tree64e7dcd1875b9e365f087353bf7fd8c4933ea3fe
parent0cc526e0e801dd0a372641bfbefb20f74e881cb9
parentc09d36c8dc765fb1558a9f529a9c1ace2403c50d
Merge nuts.ninka.net:/home/davem/src/BK/sctp-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5