projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd3813d 2ec197d)
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)
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


Trivial merge
John Crispins staging tree