From: Anthony Liguori Date: Mon, 14 Jan 2013 16:27:08 +0000 (-0600) Subject: Merge remote-tracking branch 'spice/spice.v67' into staging X-Git-Tag: v1.4.0-rc0~193 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=167eb811d006b95e9a26d4a0e681907ae77f5ce4 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 --- 167eb811d006b95e9a26d4a0e681907ae77f5ce4