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)
commita97c3b80528892ee5a78046d75b23f53c283e413
tree7c1d4e1fd29f6e46446491c8be2a22eecceeaa35
parent8e018235150d59daa128f4cf0f2b48caaae6a089
parent748261c0e5eeffb644a1f9624851aeae600f09fd
Merge penguin:v2.5/linux
into athlon.transmeta.com:/home/torvalds/v2.5/linux
include/linux/fs.h