]> git.hungrycats.org Git - linux/commitdiff
Merge bk://ldm.bkbits.net/linux-2.5-driverfs
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 1 Aug 2002 04:58:01 +0000 (21:58 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 1 Aug 2002 04:58:01 +0000 (21:58 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge