]> git.hungrycats.org Git - linux/commitdiff
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Sat, 7 Dec 2002 06:31:19 +0000 (22:31 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Sat, 7 Dec 2002 06:31:19 +0000 (22:31 -0800)
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5


Trivial merge