]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4d4081 64c27e5)
Merge remote-tracking branch 'sstabellini/for_1.1.1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Jun 2012 17:15:51 +0000 (12:15 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Jun 2012 17:15:51 +0000 (12:15 -0500)
* sstabellini/for_1.1.1:
  qemu/xendisk: set maximum number of grants to be used


Trivial merge
Qemu copy for testing