diff options
author | Peter Maydell | 2014-11-14 13:05:33 +0100 |
---|---|---|
committer | Peter Maydell | 2014-11-14 13:05:33 +0100 |
commit | 4e70f9271dabc58fbf14680843bfac510c193152 (patch) | |
tree | 8414b833cbd7e2fe8c4ed5e11674d6da32ef2b43 /pc-bios/openbios-sparc64 | |
parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
parent | xen_disk: fix unmapping of persistent grants (diff) | |
download | qemu-4e70f9271dabc58fbf14680843bfac510c193152.tar.gz qemu-4e70f9271dabc58fbf14680843bfac510c193152.tar.xz qemu-4e70f9271dabc58fbf14680843bfac510c193152.zip |
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>
Diffstat (limited to 'pc-bios/openbios-sparc64')
0 files changed, 0 insertions, 0 deletions