]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk:14691
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 26 Jul 2002 07:32:55 +0000 (00:32 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 26 Jul 2002 07:32:55 +0000 (00:32 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge