Merge branch 'acpi-pm' into linux-next

* acpi-pm:
  ACPI / PM: Fix potential problem in acpi_device_get_power()
This commit is contained in:
Rafael J. Wysocki 2013-04-08 12:31:48 +02:00
commit 077f893bd9