| commit | 4e70f9271dabc58fbf14680843bfac510c193152 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 14 Nov 2014 12:05:33 +0000 (14 12:05 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 14 Nov 2014 12:05:33 +0000 (14 12:05 +0000) | ||
| tree | 8414b833cbd7e2fe8c4ed5e11674d6da32ef2b43 | treesnapshot (tar.gz zip) |
| parent | b87dcdd0746dc110fa5a3353cbc257818e618930 | commitdiff |
| parent | 2f01dfacb56bc7a0d4639adc9dff9aae131e6216 | commitdiff |
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>
* 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>