summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-08 10:22:12 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-08 10:22:12 +0100
commit616f16093d852215f6a1188de1bafdc1f8892924 (patch)
treebb2048145cb73e497c37b523eaf8272f5fe0f9c5
parent168b6511e8e09de45bed272aaf76ef4d4ca3c05d (diff)
parentd0404738c687c0ecaa7d6b7c5c39e4c0dac791e6 (diff)
parentf859422075165e32c00c8d75d63f300015cc07ae (diff)
parenta3381e3a65cbaf612c8f584906c4dba27e84267c (diff)
downloadlinux-616f16093d852215f6a1188de1bafdc1f8892924.tar.bz2
Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'pm-domains'
* pm-cpufreq: arm: imx: Add MODULE_ALIAS for cpufreq cpufreq: Add and use cpufreq_for_each_{valid_,}entry_idx() cpufreq: intel_pstate: Enable HWP during system resume on CPU0 cpufreq: scpi: fix error return code in scpi_cpufreq_init() cpufreq: scpi: fix static checker warning cdev isn't an ERR_PTR cpufreq: remove at32ap-cpufreq cpufreq: AMD: Ignore the check for ProcFeedback in ST/CZ cpufreq: Skip cpufreq resume if it's not suspended * pm-cpuidle: x86: PM: Make APM idle driver initialize polling state * pm-domains: PM / domains: Fix up domain-idle-states OF parsing