Merge branch 'acpi-pm' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Apr 2013 10:31:48 +0000 (12:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Apr 2013 10:31:48 +0000 (12:31 +0200)
* acpi-pm:
  ACPI / PM: Fix potential problem in acpi_device_get_power()


Trivial merge