From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 19 Jan 2012 18:51:02 +0000 (-0600)
Subject: Merge remote-tracking branch 'spice/spice.v47' into staging
X-Git-Tag: v1.1-rc0~567
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=515689235c4c3d9c3f0406ddcdd21ed8da77062b;hp=-c;p=qemu.git

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

* spice/spice.v47:
  qxl: Slot sanity check in qxl_phys2virt() is off by one, fix
---

515689235c4c3d9c3f0406ddcdd21ed8da77062b