Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Export rest of the subsys PM callbacks
  ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
  ACPI / PM: Hold ACPI scan lock over the "freeze" sleep state
  ACPI / PM: Export acpi_target_system_state() to modules

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

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

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

diff --cc kernel/power/suspend.c
Simple merge