]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'acpi-pm-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 31 Jul 2013 12:00:12 +0000 (14:00 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 31 Jul 2013 12:00:12 +0000 (14:00 +0200)
commitec179bce5a802c31ee5b9f39a9e0f43f268d474b
tree86c3c7e09386a7dd087b8d574f9db7d5dea0c133
parent38b91dc961602f80b5666969646c98021a08d58a
parent8ad928d52e63a9b7d69f0873d7318c4561e2f8cd
Merge branch 'acpi-pm-next' into linux-next

* acpi-pm-next:
  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