]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 923fd98 fa98efe)
Merge remote-tracking branch 'spice/spice.v65' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 30 Nov 2012 16:20:36 +0000 (10:20 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 30 Nov 2012 16:20:36 +0000 (10:20 -0600)
* spice/spice.v65:
  qxl: reload memslots after migration, when qxl is in UNDEFINED mode

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge
Qemu copy for testing