Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:28:17 +0000 (01:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:28:17 +0000 (01:28 +0200)
commit0ad4c9a9848fdd46dc422160efd947489a98bbc1
treeb9a0de74dd0725d8b705b7a18b0fb14632c423fe
parentabe5430e9d5314190ca571b3bfc0c42000634378
parent593298e68a3a53bd2fe942244250dfef4d68d477
Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Add state information to error message in acpi_device_set_power()
  ACPI / PM: Remove redundant power manageable check from acpi_bus_set_power()
  ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
  ACPI / PM: Make messages in acpi_device_set_power() print device names
  ACPI / PM: Only set power states of devices that are power manageable
drivers/acpi/power.c
drivers/acpi/scan.c
include/acpi/acpi_bus.h