From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 23 Feb 2013 22:15:43 +0000 (+0100)
Subject: Merge branch 'acpi-pm' into fixes
X-Git-Tag: firefly_0821_release~3680^2~1034^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4383822020c54c21eb2eb939a3233b44a51e8ca0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-pm' into fixes

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

4383822020c54c21eb2eb939a3233b44a51e8ca0