]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6284a5d0c13afe9cf477a2901b16a8c857021092
treeb79ff0d36f216fcadce546aa33219e06f1126b58
parent5a071640ab6cb4e65cfbb12f9d653dcce89f1935
parentfe292c68301b3f2e9957bde741c2690d3c07a28a
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