From: Rafael J. Wysocki Date: Sat, 23 Feb 2013 22:15:43 +0000 (+0100) Subject: Merge branch 'acpi-pm' into fixes X-Git-Tag: MMI-PSA29.97-13-9~14955^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4383822020c54c21eb2eb939a3233b44a51e8ca0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'acpi-pm' into fixes * acpi-pm: ACPI / PM: Take unusual configurations of power resources into account --- 4383822020c54c21eb2eb939a3233b44a51e8ca0