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)
commit7d627280b359a965105bcdd8f08224dfa14a3961
tree7c9a91ea3869ac2ccafc80a5590f35af9a7d3d58
parent76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4
parentc81407fe573d8ac3c7150f5373475598c59197de
parent94fb823fcb4892614f57e59601bb9d4920f24711
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