]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a70f655 c8c4d0f)
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)
commitee950ca13e0a7ef4f13f2ecc315214c6c44a67fd
tree4352a861a639e7d1738fbe30223ea2fbdb6bf26ftree | snapshot
parenta70f6555f5e54ef6db429aa35209a5f6a9caf025commit | diff
parentc8c4d0f2310f0438deaceb0e0bf8eff92b61f525commit | 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.