]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 84aad1f 6194456)
Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Jan 2015 02:10:48 +0000 (18:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Jan 2015 02:10:48 +0000 (18:10 -0800)
commit5b94b9ab69e1b6b24fdc73b3079cbe42dc96ef41
tree4352a861a639e7d1738fbe30223ea2fbdb6bf26ftree | snapshot
parent84aad1f87a412accba46b18a776b7cacb6ac2581commit | diff
parent61944565fd08088b5bf821c1bac13fae1f1cddeccommit | diff
Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux

Pull two nfsd bugfixes from Bruce Fields.

* 'for-3.19' of git://linux-nfs.org/~bfields/linux:
  rpc: fix xdr_truncate_encode to handle buffer ending on page boundary
  nfsd: fix fi_delegees leak when fi_had_conflict returns true
Linux Kernel Source Tree.