]> git.hungrycats.org Git - linux/commitdiff
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)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
fs/driverfs/inode.c

Simple merge