summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-14 15:17:32 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-14 15:17:32 +0100
commit31689497d90e589d7050fc7bc850b4b46e632bfc (patch)
tree0c9d1c28a4a6c1a7877b6d0c0d9f2e4dc644b4bd /include
parenta9b70711896043d5913c6cf10785dc7d13aed27d (diff)
parent67732cd34382066ae5df313b6dad65ab14b9735f (diff)
parent403b9636fe9f59124d1a437a297b330729061252 (diff)
parent09712f557b31838092e1f22a5f2dd131a843a3de (diff)
downloadlinux-31689497d90e589d7050fc7bc850b4b46e632bfc.tar.bz2
Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq'
* pm-domains: PM / Domains: Fix initial default state of the need_restore flag PM / Domains: Change prototype for the attach and detach callbacks * pm-sleep: PM / sleep: Fix entering suspend-to-IDLE if no freeze_oops is set * pm-cpufreq: cpufreq: Avoid crash in resume on SMP without OPP cpufreq: cpufreq-dt: Fix arguments in clock failure error message