Merge cam.ac.uk:/usr/src/l25 into cam.ac.uk:/usr/src/tng
authorAnton Altaparmakov <aia21@cam.ac.uk>
Thu, 11 Apr 2002 00:33:34 +0000 (01:33 +0100)
committerAnton Altaparmakov <aia21@cam.ac.uk>
Thu, 11 Apr 2002 00:33:34 +0000 (01:33 +0100)
commitf2f4aaf98fef655671f7577e4cb15104416a86ee
treeffa6c0168190f2f19151b52b6b9c9a69eec668f4
parent22e962f9b7a7abbc2d17ceaf3917bb8e67b68a8f
parent9b274ca10f550a7c484b2000648d885e2603902d
Merge cam.ac.uk:/usr/src/l25 into cam.ac.uk:/usr/src/tng
arch/i386/defconfig
arch/ppc64/defconfig
include/linux/fs.h