Merge branch 'nfs-for-2.6.39' into nfs-for-next
commit0acd2201920d0968919f4f5797d63f7b6f2b19d4
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 24 Mar 2011 21:03:14 +0000 (24 17:03 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 24 Mar 2011 21:03:14 +0000 (24 17:03 -0400)
tree9b241d264f42eff3ff4eeffb67616fca0490e460
parent8f70e95f9f4159184f557a1db60c909d7c1bd2e3
parent35124a0994fc02545b14b9fa3aad000b3331f1c0
Merge branch 'nfs-for-2.6.39' into nfs-for-next
fs/nfs/dir.c
fs/nfs/getroot.c
fs/nfs/inode.c
fs/nfs/internal.h
fs/nfs/nfs4_fs.h
fs/nfs/nfs4proc.c
fs/nfs/nfs4xdr.c
include/linux/nfs4.h
include/linux/nfs_xdr.h