]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a69f221 08688af)
Merge remote-tracking branch 'spice/spice.v67' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:27:08 +0000 (10:27 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:27:08 +0000 (10:27 -0600)
* 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>

Trivial merge
Qemu copy for testing