]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/actbl.h
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Mar 2013 18:47:43 +0000 (11:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Mar 2013 18:47:43 +0000 (11:47 -0700)
commitb92eded4b7e6facc4e4ba07de89a3fc24de99552
tree5efe4d2959768a27eb5cd42573b8390cd6a1fb44
parent3615db41c4b82896de450b6b4e3dab2420dcae51
parent6e2a4505dba0cae8faa701426185dfb7b49f537c
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