Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
Linus Torvalds [Wed, 9 Jun 2010 19:43:04 +0000 (12:43 -0700)]
* '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

1  2 
fs/nfsd/vfs.c

diff --cc fs/nfsd/vfs.c
Simple merge