Merge remote-tracking branch 'spice/spice.v52' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Apr 2012 12:56:18 +0000 (07:56 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Apr 2012 12:56:18 +0000 (07:56 -0500)
* 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

1  2 
trace-events

diff --cc trace-events
Simple merge