Merge branch 'acpi-pm' into linux-next

* acpi-pm:
  ACPI / PM: Fix potential problem in acpi_device_get_power()