From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 11 Jun 2012 17:15:51 +0000 (-0500)
Subject: Merge remote-tracking branch 'sstabellini/for_1.1.1' into staging
X-Git-Tag: v2.7.1~4954
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=248bfdc9f53a85b82e3ff39c5122d8849f61ee65;p=mirror_qemu.git

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
---

248bfdc9f53a85b82e3ff39c5122d8849f61ee65