Anthony Liguori 8385b173a0 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>
2012-12-10 08:33:11 -06:00
..
2012-12-04 14:42:05 +01:00
2012-12-04 13:52:43 +01:00
2012-12-04 13:52:43 +01:00
2012-12-04 13:52:43 +01:00
2012-12-04 14:50:21 +01:00
2012-12-04 14:50:21 +01:00
2012-12-04 14:50:22 +01:00
2012-11-14 18:19:22 +01:00
2012-11-26 14:25:42 -06:00
2012-12-04 14:50:21 +01:00
2012-12-04 14:50:21 +01:00
2012-11-26 09:35:35 -06:00
2012-11-26 09:35:35 -06:00
2012-12-04 14:42:05 +01:00
2012-11-26 09:35:37 -06:00
2012-12-04 14:50:22 +01:00
2012-11-26 13:41:00 -06:00
2012-12-04 13:52:43 +01:00
2012-12-04 13:52:43 +01:00
2012-11-26 13:41:00 -06:00
2012-12-04 14:50:22 +01:00
2012-12-04 14:50:22 +01:00
2012-11-16 11:27:07 +01:00
2012-11-16 11:27:06 +01:00
2012-11-29 17:25:02 -06:00
2012-11-29 17:25:02 -06:00