diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:33:11 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:33:11 -0600 |
| commit | 8385b173a0ca4c2345434104e6cc2a7259adc4b9 (patch) | |
| tree | bc80c590aafe83e4febc227a03b6763e19cd6f49 /hw/macio.c | |
| parent | 16ef55ca85ac8c8fcac46547108bd1c8b44943a2 (diff) | |
| parent | 3e43749882c558875f70ac5deda39cdc9797e245 (diff) | |
| download | qemu-8385b173a0ca4c2345434104e6cc2a7259adc4b9.zip qemu-8385b173a0ca4c2345434104e6cc2a7259adc4b9.tar.gz qemu-8385b173a0ca4c2345434104e6cc2a7259adc4b9.tar.bz2 | |
Merge remote-tracking branch 'kraxel/acpi.1' into staging
* kraxel/acpi.1:
acpi: drop debug port
q35: update lpc pci config space according to configured devices
apci: switch piix4 pci hotplug to memory api
acpi: remove acpi_gpe_blk
apci: switch piix4 gpe to memory api
acpi: fix piix4 smbus mapping
acpi: switch smbus to memory api
acpi: cleanup ich9 memory region
apci: switch ich9 smi to memory api
apci: switch ich9 gpe to memory api
acpi: cleanup vt82c686 memory region
acpi: cleanup piix4 memory region
apci: switch evt to memory api
apci: switch cnt to memory api
apci: switch timer to memory api
apci: switch vt82c686 to memory api
apci: switch ich9 to memory api
apci: switch piix4 to memory api
Conflicts:
hw/lpc_ich9.c
Resolved merge conflict due to apm_init adding an argument.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/macio.c')
0 files changed, 0 insertions, 0 deletions