diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-14 10:51:51 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-14 10:51:51 +0100 |
| commit | 4650b2792944e4cee86df6b016f2b7338a0b33f1 (patch) | |
| tree | 06410b514413dedd29919228b315a425bab2dd0a /drivers | |
| parent | e6035258dbf9804b8e22878d3932e418c8875963 (diff) | |
| parent | 22782b3f9bb8ae21c710e2880db21bc729771e92 (diff) | |
| parent | 8e3b403954507eb74ad241dc3750443ccc9ee40a (diff) | |
| download | linux-4650b2792944e4cee86df6b016f2b7338a0b33f1.tar.bz2 | |
Merge branches 'pm-cpuidle' and 'pm-cpufreq'
* pm-cpuidle:
cpuidle: governor: Add new governors to cpuidle_governors again
cpuidle: menu: Avoid overflows when computing variance
* pm-cpufreq:
cpufreq: intel_pstate: Fix up iowait_boost computation
cpufreq: pxa2xx: remove incorrect __init annotation
cpufreq: Improve kerneldoc comments for cpufreq_cpu_get/put()