Merge branch 'odirect'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 25 Jun 2006 10:27:31 +0000 (06:27 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 25 Jun 2006 10:27:31 +0000 (06:27 -0400)
commitccf01ef7aa9c6c293a1c64c27331a2ce227916ec
tree421fa29aedff988e392f92780637553e275d37a0
parent82b145c5a572f7fa7211dffe2097234dc91bcecc
Merge branch 'odirect'
fs/nfs/direct.c
include/linux/nfs_xdr.h