]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 19 Aug 2009 22:21:52 +0000 (18:21 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 19 Aug 2009 22:21:52 +0000 (18:21 -0400)
commit05b9fa79cb006a7c27aa49b450a166b402ceb7dc
tree2ea4f3ab1d3766204a55ec26600b848ed3a7e8aa
parent4aacbac062d1a40c460d4d116b1b9e822a1333f2
parent4f426813c82e92b144f94e655a9aeeaf2d8dbb47
Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32

Conflicts:
fs/nfs/nfs4xdr.c
Documentation/kernel-parameters.txt
fs/nfs/nfs4xdr.c
fs/nfs/write.c