diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 23:54:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 23:54:52 +0200 |
| commit | c6f5c93098f5577210f8f3ea22209b3f266c66af (patch) | |
| tree | bc641dfb6f71b6584cedde4b6721ca716f8bf3d0 /drivers/scsi/pm8001 | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | nfsd: include cld.h in the headers_install target (diff) | |
| download | linux-c6f5c93098f5577210f8f3ea22209b3f266c66af.tar.xz linux-c6f5c93098f5577210f8f3ea22209b3f266c66af.zip | |
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
Diffstat (limited to 'drivers/scsi/pm8001')
0 files changed, 0 insertions, 0 deletions