Merge cam.ac.uk:/usr/src/bklinux-2.5
authorAnton Altaparmakov <aia21@cam.ac.uk>
Mon, 18 Mar 2002 23:29:13 +0000 (23:29 +0000)
committerAnton Altaparmakov <aia21@drop.stormcorp.org>
Mon, 18 Mar 2002 23:29:13 +0000 (23:29 +0000)
commitc1a6eca6a59514fd735f428abe416e8ea4b91aa2
tree35c1cbff6ac0904035385c0fca62b4332bf0f9fc
parent3cc589c414b4e08b6f967d41cbd4e65df14ef5e3
parent085c9a18acd4003fa77cf852aa770e52b2ce6a71
Merge cam.ac.uk:/usr/src/bklinux-2.5
into cam.ac.uk:/usr/src/bkntfs-tng-2.5
include/linux/fs.h