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)
commitdeb0c98c7f6035d47a247e548384517a955314a5
tree26428b06c7c0c7db106d731c61c1dee2069c3a39
parenta5f28ae4df291d81d9d23066f88c55ca45e388d3
parent260c64d23532caf19abb77e696971da05c388489
Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux:
  Revert "nfsd4: fix error return when pseudoroot missing"