From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 31 Oct 2014 21:25:07 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq' and 'pm-sleep'
X-Git-Tag: firefly_0821_release~176^2~2933^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7d627280b359a965105bcdd8f08224dfa14a3961;p=firefly-linux-kernel-4.4.55.git

Merge branches 'pm-cpufreq' and 'pm-sleep'

* pm-cpufreq:
  cpufreq: cpufreq-dt: Restore default cpumask_setall(policy->cpus)
  cpufreq: cpufreq-dt: disable unsupported OPPs

* pm-sleep:
  PM / Sleep: fix recovery during resuming from hibernation
  PM / Sleep: fix async suspend_late/freeze_late error handling
---

7d627280b359a965105bcdd8f08224dfa14a3961