]> 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)
commit0ba94481e187f0d805763b8a5dffbba28221dc54
tree266990814ef9e6ac3b35448bc25119be112a26d0
parentd25547bb601336fa16a0896395100c5b1518d2c3
parent375ee6614fdd74c54984fe68d141a198b2cc5103
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