projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 410fc4c f0666b1)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Aug 2012 17:57:31 +0000 (10:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Aug 2012 17:57:31 +0000 (10:57 -0700)
commitc8924234bd9c06fe86bae648c472d56cb10640a5
treeb7ecba9e5fd1f7c451f00fc52a98c321153cc522tree | snapshot
parent410fc4ce8a373a3c35c73ac2c7c29f2bac6400bfcommit | diff
parentf0666b1ac875ff32fe290219b150ec62eebbe10ecommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull two ceph fixes from Sage Weil:
 "The first patch fixes up the old crufty open intent code to use the
  atomic_open stuff properly, and the second fixes a possible null deref
  and memory leak with the crypto keys."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: fix crypto key null deref, memory leak
  ceph: simplify+fix atomic_open
John Crispins staging tree