diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-15 01:51:33 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-15 01:51:33 +0200 |
| commit | f63e4f7d4179c9157c51bbe82af7c8f6b5fb39dd (patch) | |
| tree | 91ad0af61dcab5ae86c2a07e7eb44c0f7de5eb3c /kernel | |
| parent | b8e11f7d2791bd9320be1c6e772a60b2aa093e45 (diff) | |
| parent | b2cdd8e1b54849477a32d820acc2e87828a38f3d (diff) | |
| parent | 74b2c983960b1af193eafe6b4ea3bb1bf77e2650 (diff) | |
Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'pm-devfreq'
* pm-cpufreq:
cpufreq: conservative: Allow down_threshold to take values from 1 to 10
Revert "cpufreq: schedutil: Reduce frequencies slower"
* pm-cpuidle:
cpuidle: dt: Add missing 'of_node_put()'
* pm-devfreq:
PM / devfreq: exynos-ppmu: Staticize event list
PM / devfreq: exynos-ppmu: Handle return value of clk_prepare_enable
PM / devfreq: exynos-nocp: Handle return value of clk_prepare_enable