diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-14 10:27:08 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-14 10:27:08 -0600 |
commit | 167eb811d006b95e9a26d4a0e681907ae77f5ce4 (patch) | |
tree | e8a00ba51eeca4fa07731167d572918d51b13f53 /qemu-img.c | |
parent | a69f221ef840cde778080ffaa78e0d9dd27b87c7 (diff) | |
parent | 08688af04dc1137ac2f420b35c235183926b4a23 (diff) | |
download | qemu-167eb811d006b95e9a26d4a0e681907ae77f5ce4.zip qemu-167eb811d006b95e9a26d4a0e681907ae77f5ce4.tar.gz qemu-167eb811d006b95e9a26d4a0e681907ae77f5ce4.tar.bz2 |
Merge remote-tracking branch 'spice/spice.v67' into staging
* spice/spice.v67:
qxl: Don't drop client capability bits
qxl: Fix SPICE_RING_PROD_ITEM(), SPICE_RING_CONS_ITEM() sanity check
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-img.c')
0 files changed, 0 insertions, 0 deletions