From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 18 Apr 2012 12:56:18 +0000 (-0500)
Subject: Merge remote-tracking branch 'spice/spice.v52' into staging
X-Git-Tag: v1.1-rc0~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25b9e14e78bf9790cdee12d57c45898e86866a24;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'spice/spice.v52' into staging

* spice/spice.v52:
  qxl-render: fix broken vnc+spice since commit f934493
  qxl: set default values of vram*_size_mb to -1
  trace-events: remove unused qxl_vga_ioport_while_not_in_vga_mode
---

25b9e14e78bf9790cdee12d57c45898e86866a24