]> git.hungrycats.org Git - linux/commitdiff
Merge davem@nuts.ninka.net:/home/davem/src/BK/sparc-2.5
authorDavid S. Miller <davem@kernel.bkbits.net>
Fri, 21 Feb 2003 19:59:58 +0000 (11:59 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 21 Feb 2003 19:59:58 +0000 (11:59 -0800)
into kernel.bkbits.net:/home/davem/sparc-2.5


Trivial merge