tree 3bfc91336f7310e3b70058db85e28833067bc661
parent bf900afba96bf34038bf2c944bbcad7424a40051
parent b5d667eb392ed901fc7ae76869c7a130559e193c
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1361657743 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1361657743 +0100

Merge branch 'acpi-pm' into fixes

* acpi-pm:
  ACPI / PM: Take unusual configurations of power resources into account