diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-14 12:05:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-14 12:05:33 +0000 |
| commit | 4e70f9271dabc58fbf14680843bfac510c193152 (patch) | |
| tree | 8414b833cbd7e2fe8c4ed5e11674d6da32ef2b43 /bsd-user/Makefile.objs | |
| parent | b87dcdd0746dc110fa5a3353cbc257818e618930 (diff) | |
| parent | 2f01dfacb56bc7a0d4639adc9dff9aae131e6216 (diff) | |
| download | 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 'bsd-user/Makefile.objs')
0 files changed, 0 insertions, 0 deletions