]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a75e667 6b7332e)
Merge remote-tracking branch 'spice/spice.v47' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 19 Jan 2012 18:51:02 +0000 (12:51 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 19 Jan 2012 18:51:02 +0000 (12:51 -0600)
* spice/spice.v47:
  qxl: Slot sanity check in qxl_phys2virt() is off by one, fix


Trivial merge
Qemu copy for testing