From: Anthony Liguori Date: Mon, 5 Aug 2013 13:01:39 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/block' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92;p=qemu.git Merge remote-tracking branch 'stefanha/block' into staging # By Kevin Wolf # Via Stefan Hajnoczi * stefanha/block: block: Disable driver-specific options for 1.6 Message-id: 1375461379-20277-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori --- 56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92