summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAnthony Liguori2013-08-05 15:01:39 +0200
committerAnthony Liguori2013-08-05 15:01:39 +0200
commit56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92 (patch)
treefbef641193f8527c10b03289fdf89c5c2a015ee8 /include
parentMerge remote-tracking branch 'mjt/trivial-patches' into staging (diff)
parentblock: Disable driver-specific options for 1.6 (diff)
downloadqemu-56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92.tar.gz
qemu-56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92.tar.xz
qemu-56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92.zip
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 <aliguori@us.ibm.com>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions