| commit | deb0c98c7f6035d47a247e548384517a955314a5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 08 17:08:01 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 08 17:08:01 2010 -0800 |
| tree | 26428b06c7c0c7db106d731c61c1dee2069c3a39 | |
| parent | a5f28ae4df291d81d9d23066f88c55ca45e388d3 [diff] | |
| parent | 260c64d23532caf19abb77e696971da05c388489 [diff] |
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"