| commit | c6f5c93098f5577210f8f3ea22209b3f266c66af | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 19 Apr 2012 21:54:52 +0000 (19 14:54 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 19 Apr 2012 21:54:52 +0000 (19 14:54 -0700) | ||
| tree | bc641dfb6f71b6584cedde4b6721ca716f8bf3d0 | treesnapshot (tar.gz zip) |
| parent | 19853301ef3289bda2d5264c1093e74efddaeab9 | commitdiff |
| parent | d22053cdbd914a6c97ea101adf411a8fd7e282ad | commitdiff |
Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from J. Bruce Fields:
"One bugfix, and one minor header fix from Jeff Layton while we're
here"
* 'for-3.4' of git://linux-nfs.org/~bfields/linux:
nfsd: include cld.h in the headers_install target
nfsd: don't fail unchecked creates of non-special files
Pull nfsd bugfixes from J. Bruce Fields:
"One bugfix, and one minor header fix from Jeff Layton while we're
here"
* 'for-3.4' of git://linux-nfs.org/~bfields/linux:
nfsd: include cld.h in the headers_install target
nfsd: don't fail unchecked creates of non-special files
| fs/nfsd/nfs4proc.c | diff1 | diff2 | blobhistory |