Merge branches 'acpi-pm', 'acpi-apei', 'acpi-osl' and 'acpi-pci'

* acpi-pm:
  ACPI / PM: Add missing pm_generic_complete() invocation
  ACPI / PM: Turn power resources on and off in the right order during resume
  ACPI / PM: Rework device power management to follow ACPI 6
  ACPI / PM: Drop stale comment from acpi_power_transition()

* acpi-apei:
  GHES: Make NMI handler have a single reader
  GHES: Elliminate double-loop in the NMI handler
  GHES: Panic right after detection
  GHES: Carve out the panic functionality
  GHES: Carve out error queueing in a separate function

* acpi-osl:
  ACPI / osl: use same type for acpi_predefined_names values as in definition

* acpi-pci:
  ACPI / PCI: remove stale list_head in struct acpi_prt_entry

diff --cc drivers/acpi/osl.c
index 5226a8b,39748bb,39748bb,7a327b2,7ccba39..a3acd84
--- 1/drivers/acpi/osl.c
--- 2/drivers/acpi/osl.c
--- 3/drivers/acpi/osl.c
--- 4/drivers/acpi/osl.c
--- 5/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@@@@ -175,10 -175,14 -175,14 -175,14 -175,14 +175,10 @@@@@@ static void __init acpi_request_region 
        if (!addr || !length)
                return;
     
 ----   /* Resources are never freed */
 ----   if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
 ----           request_region(addr, length, desc);
 ----   else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
 ----           request_mem_region(addr, length, desc);
 ++++   acpi_reserve_region(addr, length, gas->space_id, 0, desc);
     }
     
 --- static int __init acpi_reserve_resources(void)
 +++ static void __init acpi_reserve_resources(void)
     {
        acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length,
                "ACPI PM1a_EVT_BLK");

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge