Merge branch 'acpi-pm' into fixes
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 23 Feb 2013 22:15:43 +0000 (23:15 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 23 Feb 2013 22:15:43 +0000 (23:15 +0100)
* acpi-pm:
  ACPI / PM: Take unusual configurations of power resources into account


Trivial merge