]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3e8275 b18620c)
Merge remote-tracking branch 'sstabellini/xen_mem_fix' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 6 Jan 2012 14:12:23 +0000 (08:12 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 6 Jan 2012 14:12:23 +0000 (08:12 -0600)
* sstabellini/xen_mem_fix:
  xen: Fix after recent change in dirty bitmap tracking.


Trivial merge
Qemu copy for testing