Merge branch 'nfs-for-2.6.39' into nfs-for-next
Trond Myklebust [Thu, 24 Mar 2011 21:03:14 +0000 (17:03 -0400)]
1  2 
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

diff --cc fs/nfs/dir.c
Simple merge
Simple merge
diff --cc fs/nfs/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge