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


Trivial merge