]> git.proxmox.com Git - qemu.git/commit
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)
commit248bfdc9f53a85b82e3ff39c5122d8849f61ee65
treee02643a1f016f641df9b8291e8d7106a86899ffe
parente4d40816f152b0021e0bdc2413f4b72fa9ea5e00
parent64c27e5b1fdb6d94bdc0bda3b1869d7383a35c65
Merge remote-tracking branch 'sstabellini/for_1.1.1' into staging

* sstabellini/for_1.1.1:
  qemu/xendisk: set maximum number of grants to be used