]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/sparc-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Tue, 22 Apr 2003 01:34:12 +0000 (18:34 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Tue, 22 Apr 2003 01:34:12 +0000 (18:34 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge