diff options
| author | Peter Maydell | 2015-09-10 11:24:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-10 11:24:30 +0200 |
| commit | fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17 (patch) | |
| tree | f0fc8c4a58065ae806f6b733ba38a8d3ede69b9b /include/hw/arm/linux-boot-if.h | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150908'... (diff) | |
| parent | hw/pci: fix pci_update_mappings() trace events (diff) | |
| download | qemu-fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17.tar.gz qemu-fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17.tar.xz qemu-fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio,pc,acpi fixes, cleanups
Fixes all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 10 Sep 2015 10:16:18 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
hw/pci: fix pci_update_mappings() trace events
pc: memhotplug: keep reserved-memory-end broken on 2.4 and earlier machines
pc: memhotplug: fix incorrectly set reserved-memory-end
acpi: Remove unused definition.
virtio: avoid leading underscores for helpers
pc: Remove redundant arguments from xen_hvm_init()
pci: Fix pci_device_iommu_address_space() bus propagation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/arm/linux-boot-if.h')
0 files changed, 0 insertions, 0 deletions