Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 27 Apr 2013 23:54:00 +0000 (01:54 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 27 Apr 2013 23:54:00 +0000 (01:54 +0200)
* acpi-pm:
  ACPI / PM: Expose lists of device wakeup power resources to user space
  ACPI / PM: Fix potential problem in acpi_device_get_power()

1  2 
drivers/acpi/power.c

Simple merge