From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: firefly_0821_release~176^2~4421
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ba74517e4cc30e6fd92925fd134b820cbeb9249;p=firefly-linux-kernel-4.4.55.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