Merge commit 'v2.6.34-rc6'
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 4 May 2010 15:27:05 +0000 (11:27 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 4 May 2010 15:29:05 +0000 (11:29 -0400)
commit5306293c9cd2caf41849cc909281bda628bb989e
tree3be4e8231e2772c8a43ddbef5c6a72c20b3054bb
parentdbd65a7e44fff4741a0b2c84bd6bace85d22c242
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8
Merge commit 'v2.6.34-rc6'

Conflicts:
fs/nfsd/nfs4callback.c
fs/nfsd/export.c
fs/nfsd/nfs4callback.c
fs/nfsd/nfs4proc.c
fs/nfsd/nfs4state.c
fs/nfsd/nfs4xdr.c
fs/nfsd/nfsctl.c
fs/nfsd/vfs.c
net/sunrpc/svc_xprt.c