]> 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>
Wed, 2 Apr 2003 22:50:21 +0000 (14:50 -0800)
committerDavid S. Miller <davem@kernel.bkbits.net>
Wed, 2 Apr 2003 22:50:21 +0000 (14:50 -0800)
into kernel.bkbits.net:/home/davem/sparc-2.5


Trivial merge