]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 401c58f f41c5ad)
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jun 2014 00:20:38 +0000 (14:20 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jun 2014 00:20:38 +0000 (14:20 -1000)
commit147f1404db3ed0c3019002eef693c5d297b8f161
tree7349fe8111e2ba8ee7a9aba69ec8893a69d8a573tree | snapshot
parent401c58fcbbf570e7e4a8ee0e21ffd829deb4de0bcommit | diff
parentf41c5ad2ff2657978a9712b9ea80cd812a7da2b0commit | diff
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Fixes for a new regression from the xdr encoding rewrite, and a
  delegation problem we've had for a while (made somewhat more annoying
  by the vfs delegation support added in 3.13)"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  NFSD: fix bug for readdir of pseudofs
  NFSD: Don't hand out delegations for 30 seconds after recalling them.
Linux kernel for KaRo TX COM modules