summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-05-08 15:54:36 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-08 15:54:36 -0500
commitcad2b59c198340a636c5e015fb90e0326a1d3dd7 (patch)
tree1441c300722db4bda79e32a1e61e9e1c7f997a43 /VERSION
parent5f5a1318653c08e435cfa52f60b6a712815b659d (diff)
parent794d00f71d39e3d18eafade579b2ecb665d6d481 (diff)
downloadqemu-cad2b59c198340a636c5e015fb90e0326a1d3dd7.tar.gz
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Kevin Wolf (7) and Fam Zheng (3) # Via Kevin Wolf * kwolf/for-anthony: qemu-iotests: fix 017 018 for vmdk qemu-iotests: exclude vmdk and qcow from 043 qemu-iotests: exclude vmdk for test 042 qtest/ide-test: Test short and long PRDTs qtest/ide-test: Add simple DMA read/write test case qtest: Add IDE test case libqos/pci: Enable bus mastering ide: Reset BMIDEA bit when the bus master is stopped de_DE.po: Add missing leading spaces ahci: Don't allow creating slave drives Message-id: 1368023344-29731-1-git-send-email-kwolf@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions