OSDN Git Service

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)
commit34bdb1a458baaf3e56843c36deb04283c26a8099
tree353acc5fb0aafecb81a14d0c3c970cc39b81af9a
parent0ad4991cae47c0d3ae93e1531ba5572d223d700c
parent41a2a4665d401f79912a3da83ff9ef3e502bc12e
Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Expose lists of device wakeup power resources to user space
  ACPI / PM: Fix potential problem in acpi_device_get_power()
drivers/acpi/power.c