From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 14 Nov 2014 12:05:33 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/sstabellini/xen-2014-11-14' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~71
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4e70f9271dabc58fbf14680843bfac510c193152;p=qemu-upstream-unstable.git

Merge remote-tracking branch 'remotes/sstabellini/xen-2014-11-14' into staging

* remotes/sstabellini/xen-2014-11-14:
  xen_disk: fix unmapping of persistent grants
  pc: piix4_pm: init legacy PCI hotplug when running on Xen

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

4e70f9271dabc58fbf14680843bfac510c193152