]> git.hungrycats.org Git - linux/commitdiff
Merge penguin:v2.5/linux
authorLinus Torvalds <torvalds@athlon.transmeta.com>
Wed, 6 Feb 2002 14:16:18 +0000 (06:16 -0800)
committerLinus Torvalds <torvalds@athlon.transmeta.com>
Wed, 6 Feb 2002 14:16:18 +0000 (06:16 -0800)
into athlon.transmeta.com:/home/torvalds/v2.5/linux

1  2 
include/linux/fs.h

Simple merge