projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49d8137 638c323)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Mar 2014 22:00:27 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Mar 2014 22:00:27 +0000 (15:00 -0700)
commit0f2776e6151a123552fd06b666fe755fa780a967
tree57afca1fa00e0c21697e3acdcccd7ed7c544ef77tree | snapshot
parent49d8137a4039c63c834827f4bfe875e27bb9c521commit | diff
parent638c323c4d1f8eaf25224946e21ce8818f1bcee1commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This drops a bad assert that a few users have been hitting but we've
  only recently been able to track down"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: drop an unsafe assertion
John Crispins staging tree