Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 9 Mar 2010 22:22:08 +0000 (17:22 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 9 Mar 2010 22:22:08 +0000 (17:22 -0500)
commite739cf1da48e841bc5d744a99764c1a668b4bdd2
tree1d39318bbbcdd66ad8cd34823ad9befb7af08b1f
parente7b184f199fd3c80b618ec8244cbda70857d2779
parent57d54889cd00db2752994b389ba714138652e60c
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
fs/nfsd/nfs4state.c
fs/nfsd/nfs4xdr.c