]> git.hungrycats.org Git - linux/commitdiff
Merge ssh://nuts.ninka.net//home/davem/src/BK/net-2.5
authorDavid S. Miller <davem@kernel.bkbits.net>
Sun, 22 Dec 2002 15:30:15 +0000 (07:30 -0800)
committerDavid S. Miller <davem@kernel.bkbits.net>
Sun, 22 Dec 2002 15:30:15 +0000 (07:30 -0800)
into kernel.bkbits.net:/home/davem/net-2.5


Trivial merge