diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-09 23:49:16 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-09 23:49:16 +0200 |
commit | 3681196ae568f97d534537c1c1102f4707ca11f9 (patch) | |
tree | 5db37b28d0e045e6ee843fa33b576f9feb5d84b6 /kernel | |
parent | Linux 4.7-rc2 (diff) | |
parent | cpufreq: intel_pstate: Fix ->set_policy() interface for no_turbo (diff) | |
parent | cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE (diff) | |
download | linux-3681196ae568f97d534537c1c1102f4707ca11f9.tar.xz linux-3681196ae568f97d534537c1c1102f4707ca11f9.zip |
Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle'
* pm-cpufreq-fixes:
cpufreq: intel_pstate: Fix ->set_policy() interface for no_turbo
cpufreq: intel_pstate: Fix code ordering in intel_pstate_set_policy()
* pm-cpuidle:
cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE