projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e5735f 335c258)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Sep 2015 19:32:40 +0000 (12:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Sep 2015 19:32:40 +0000 (12:32 -0700)
commit8e64a7331702b7888ccf84b2b9ff46ab8e167c7f
treebe794f8219470e0e982d935f3e21a6012a685451tree
parent2e5735f4c377377cb738270024083f74ee058877commit | diff
parent335c25858218e76ef47f92ecb9d22e919d36140dcommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "These are both fixes to the new and improved keepalive2 behavior"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: advertise support for keepalive2
  libceph: don't access invalid memory in keepalive2 path
MicroBlaze GIT Repository