Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Feb 2010 01:08:01 +0000 (17:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Feb 2010 01:08:01 +0000 (17:08 -0800)
* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux:
  Revert "nfsd4: fix error return when pseudoroot missing"


Trivial merge