]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/sparc-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 7 Jan 2003 07:08:57 +0000 (23:08 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 7 Jan 2003 07:08:57 +0000 (23:08 -0800)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge