Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2013 17:31:15 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2013 17:31:15 +0000 (10:31 -0700)
commitbd2931b5cff6a3bf39bfe15fae051fb8229c0029
tree2d550ed8e2635067796c09faa9134887cab46e84
parent63edbce160c6d68c806e58db026b5881c6010e04
parentd2d1f17a0dad823a4cb71583433d26cd7f734e08
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This is a recently spotted regression in the snapshot behavior...

  It turns out several tests weren't being run in the nightlies so this
  took a while to spot"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: send snapshot context with writes
drivers/block/rbd.c