Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:42 +0000 (23:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:42 +0000 (23:11 +0200)
commita392f7d4afb850934851fde5a8e298912650a6b8
treeed9901ba019615f6911c0f9f1a3af180b243bc8f
parentf58c41cc0427115e3d750ec090020892acf0fb9c
parent4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34
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
drivers/acpi/scan.c
include/acpi/acpi_bus.h
include/linux/acpi.h
kernel/power/suspend.c