]> 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>
Tue, 7 Jan 2003 06:33:05 +0000 (22:33 -0800)
committerDavid S. Miller <davem@kernel.bkbits.net>
Tue, 7 Jan 2003 06:33:05 +0000 (22:33 -0800)
into kernel.bkbits.net:/home/davem/sparc-2.5


Trivial merge