Whamcloud - gitweb
merge from HEAD (20040128)
authorericm <ericm>
Wed, 28 Jan 2004 04:24:09 +0000 (04:24 +0000)
committerericm <ericm>
Wed, 28 Jan 2004 04:24:09 +0000 (04:24 +0000)
commitbffb251378065f1f195ae2a8fb5a0acfe1aded3b
tree17e0aacb47e25cccd60d5927c6a7e9a3a1cad385
parent67a66b7fab6050569e16c84be489d9d50e0055e6
merge from HEAD (20040128)

there's a lot of confliction in portals/knals/qswnal/qswnal_cb.c, need
Eric Barton check it more.
lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch