Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq: cpufreq: unlock when failing cpufreq_update_policy() intel_pstate: Correct rounding in busy calculation cpufreq: cpufreq-cpu0: fix CPU_THERMAL dependency * pm-cpuidle: cpuidle: mvebu: Fix the name of the states
Showing
- drivers/cpufreq/Kconfig 2 additions, 0 deletionsdrivers/cpufreq/Kconfig
- drivers/cpufreq/cpufreq.c 4 additions, 6 deletionsdrivers/cpufreq/cpufreq.c
- drivers/cpufreq/intel_pstate.c 1 addition, 4 deletionsdrivers/cpufreq/intel_pstate.c
- drivers/cpuidle/cpuidle-armada-370-xp.c 2 additions, 2 deletionsdrivers/cpuidle/cpuidle-armada-370-xp.c
Loading
Please register or sign in to comment