]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/sparc-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 13 Jan 2003 00:27:32 +0000 (16:27 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 13 Jan 2003 00:27:32 +0000 (16:27 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge