Merge remote-tracking branch 'spice/spice.v67' into staging
commit167eb811d006b95e9a26d4a0e681907ae77f5ce4
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:27:08 +0000 (14 10:27 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:27:08 +0000 (14 10:27 -0600)
treee8a00ba51eeca4fa07731167d572918d51b13f53
parenta69f221ef840cde778080ffaa78e0d9dd27b87c7
parent08688af04dc1137ac2f420b35c235183926b4a23
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>