From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Jun 2010 19:43:04 +0000 (-0700)
Subject: Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: cont_sys_log_2~3
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=b95a56809343fb727c818ad1b9da14a17fa92ef6

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
---

b95a56809343fb727c818ad1b9da14a17fa92ef6