tree 5efe4d2959768a27eb5cd42573b8390cd6a1fb44
parent 3615db41c4b82896de450b6b4e3dab2420dcae51
parent 6e2a4505dba0cae8faa701426185dfb7b49f537c
author Linus Torvalds <torvalds@linux-foundation.org> 1364582863 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1364582863 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull ceph fix from Sage Weil:
 "This fixes a regression introduced during the last merge window when
  mapping non-existent images."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: don't zero-fill non-image object requests