]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Feb 2014 20:48:46 +0000 (12:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Feb 2014 20:48:46 +0000 (12:48 -0800)
commit8ba74517e4cc30e6fd92925fd134b820cbeb9249
tree266990814ef9e6ac3b35448bc25119be112a26d0
parentbd3813d52d567ea6e85e70ce205770bfdafac368
parent2ec197db1a56c9269d75e965f14c344b58b2a4f6
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