Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 19:43:04 +0000 (12:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 19:43:04 +0000 (12:43 -0700)
commitb95a56809343fb727c818ad1b9da14a17fa92ef6
treeb79ff0d36f216fcadce546aa33219e06f1126b58
parenta7f5378e2449fc8ae3f92739a6cc2239748ef86a
parent44b56603c4c476b845a824cff6fe905c6268b2a1
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.35' of git://linux-nfs.org/~bfields/linux:
  nfsd4: shut down callback queue outside state lock
  nfsd: nfsd_setattr needs to call commit_metadata
fs/nfsd/vfs.c