Merge branches 'pm-cpufreq' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 31 Oct 2014 21:25:07 +0000 (22:25 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 31 Oct 2014 21:25:07 +0000 (22:25 +0100)
* 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


Trivial merge