From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 14 Nov 2012 23:13:50 +0000 (+0100)
Subject: Merge branch 'pm-qos' into acpi-dev-pm
X-Git-Tag: firefly_0821_release~3680^2~1523^2~3^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dea553e3fc63c5e53a3f8741f0c9f840660cf06e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-qos' into acpi-dev-pm

Material in the 'acpi-dev-pm' branch depends on 'pm-qos' commits.
---

dea553e3fc63c5e53a3f8741f0c9f840660cf06e