]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 162cbbd 044d4e1)
Merge remote-tracking branch 'sstabellini/xen-2013-04-03' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 3 Apr 2013 20:05:52 +0000 (15:05 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 3 Apr 2013 20:05:52 +0000 (15:05 -0500)
# By Hanweidong (1) and Stefano Stabellini (1)
# Via Stefano Stabellini
* sstabellini/xen-2013-04-03:
  xen-mapcache: pass the right size argument to test_bits
  xen-mapcache: replace last_address_index with a last_entry pointer


Trivial merge
Qemu copy for testing