tree bc641dfb6f71b6584cedde4b6721ca716f8bf3d0
parent 19853301ef3289bda2d5264c1093e74efddaeab9
parent d22053cdbd914a6c97ea101adf411a8fd7e282ad
author Linus Torvalds <torvalds@linux-foundation.org> 1334872492 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334872492 -0700

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