]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk:14691
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 26 Jul 2002 10:14:19 +0000 (03:14 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 26 Jul 2002 10:14:19 +0000 (03:14 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge