Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 5 Mar 2010 20:46:18 +0000 (15:46 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 5 Mar 2010 20:46:18 +0000 (15:46 -0500)
commit3fa04ecd72780da31ba8b329e148179bc24a9c7d
treef5d462fd4aee086952d18f159f737c450ab46b3b
parent180b62a3d837613fcac3ce89576526423926c3c3
parent1cda707d52e51a6cafac0aef12d2bd7052d572e6
Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
fs/nfs/inode.c
fs/nfs/nfs4proc.c
fs/nfs/nfs4xdr.c
include/linux/nfs_fs_sb.h