]> git.baikalelectronics.ru Git - 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)
commit36f9627e52d0b9a617aff40fe54173c1ced2a6c4
tree266990814ef9e6ac3b35448bc25119be112a26d0
parentf38df02abc3c44ab6576c3fd4e22d6e4b01d9bda
parenta0f41bf370daee1b653bb4de8a51930bade48f19
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