projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a2ae004 e69b8d4)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jan 2015 23:13:56 +0000 (15:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jan 2015 23:13:56 +0000 (15:13 -0800)
commit884e00f37d8b8464de6b1a5ee456957e530d6d8a
treec3652b03bd0dc739a93d8edd083961170b4d0da9tree | snapshot
parenta2ae004a988357b77ebf2a65a558d014da7c91b0commit | diff
parente69b8d414f948c242ad9f3eb2b7e24fba783dbbdcommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "These paches from Ilya finally squash a race condition with layered
  images that he's been chasing for a while"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: drop parent_ref in rbd_dev_unprobe() unconditionally
  rbd: fix rbd_dev_parent_get() when parent_overlap == 0
John Crispins staging tree