From: Linus Torvalds Date: Thu, 19 Apr 2012 21:54:52 +0000 (-0700) Subject: Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c6f5c93098f5577210f8f3ea22209b3f266c66af;p=openwrt%2Fstaging%2Fblogic.git 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 --- c6f5c93098f5577210f8f3ea22209b3f266c66af