Merge master.kernel.org:/home/mochel/BK/linux-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 18 Feb 2002 01:11:44 +0000 (17:11 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 18 Feb 2002 01:11:44 +0000 (17:11 -0800)
commitcd566b34bbdb9eb925f4634d86a05c7b7390bd8f
tree044bb274dfd9f3bafe8ced36939da7b913699a2d
parent4cb41595a8f8ada89aff6f866c9d7f4b0625e760
parent9b6cc58d89040fac69d802d8fd2f23c68b1da854
Merge master.kernel.org:/home/mochel/BK/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
fs/driverfs/inode.c