diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-09 02:08:01 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-09 02:08:01 +0100 |
commit | deb0c98c7f6035d47a247e548384517a955314a5 (patch) | |
tree | 26428b06c7c0c7db106d731c61c1dee2069c3a39 /fs/jffs2/gc.c | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/o... (diff) | |
parent | Revert "nfsd4: fix error return when pseudoroot missing" (diff) | |
download | linux-deb0c98c7f6035d47a247e548384517a955314a5.tar.xz linux-deb0c98c7f6035d47a247e548384517a955314a5.zip |
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"
Diffstat (limited to 'fs/jffs2/gc.c')
0 files changed, 0 insertions, 0 deletions