diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-29 18:47:43 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-29 18:47:43 (GMT) |
commit | b92eded4b7e6facc4e4ba07de89a3fc24de99552 (patch) | |
tree | 5efe4d2959768a27eb5cd42573b8390cd6a1fb44 /drivers/video/acornfb.h | |
parent | 3615db41c4b82896de450b6b4e3dab2420dcae51 (diff) | |
parent | 6e2a4505dba0cae8faa701426185dfb7b49f537c (diff) | |
download | linux-fsl-qoriq-b92eded4b7e6facc4e4ba07de89a3fc24de99552.tar.xz |
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
Diffstat (limited to 'drivers/video/acornfb.h')
0 files changed, 0 insertions, 0 deletions