diff options
| author | Rafael J. Wysocki <[email protected]> | 2019-03-14 09:51:51 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2019-03-14 09:51:51 +0000 |
| commit | 4650b2792944e4cee86df6b016f2b7338a0b33f1 (patch) | |
| tree | 06410b514413dedd29919228b315a425bab2dd0a /drivers/fpga/zynqmp-fpga.c | |
| parent | Merge branches 'pm-core', 'pm-sleep' and 'pm-qos' (diff) | |
| parent | cpuidle: governor: Add new governors to cpuidle_governors again (diff) | |
| parent | cpufreq: intel_pstate: Fix up iowait_boost computation (diff) | |
| download | kernel-4650b2792944e4cee86df6b016f2b7338a0b33f1.tar.gz kernel-4650b2792944e4cee86df6b016f2b7338a0b33f1.zip | |
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()