From: Linus Torvalds Date: Fri, 14 Feb 2014 20:48:46 +0000 (-0800) Subject: Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8ba74517e4cc30e6fd92925fd134b820cbeb9249;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux Pull two nfsd bugfixes from Bruce Fields. * 'for-3.14' of git://linux-nfs.org/~bfields/linux: lockd: send correct lock when granting a delayed lock. nfsd4: fix acl buffer overrun --- 8ba74517e4cc30e6fd92925fd134b820cbeb9249