]> git.hungrycats.org Git - linux/commitdiff
Merge bk://jfs.bkbits.net/linux-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 20 Sep 2002 06:46:43 +0000 (23:46 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 20 Sep 2002 06:46:43 +0000 (23:46 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge