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)
commit4383822020c54c21eb2eb939a3233b44a51e8ca0
tree3bfc91336f7310e3b70058db85e28833067bc661
parentbf900afba96bf34038bf2c944bbcad7424a40051
parentb5d667eb392ed901fc7ae76869c7a130559e193c
Merge branch 'acpi-pm' into fixes

* acpi-pm:
  ACPI / PM: Take unusual configurations of power resources into account
drivers/acpi/internal.h
drivers/acpi/scan.c