Merge branch 'nfs-for-2.6.39' into nfs-for-next

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

diff --cc fs/nfs/getroot.c
Simple merge

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

diff --cc fs/nfs/internal.h
Simple merge

diff --cc fs/nfs/nfs4_fs.h
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/nfs/nfs4xdr.c
Simple merge

diff --cc include/linux/nfs4.h
Simple merge

diff --cc include/linux/nfs_xdr.h
Simple merge