diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-30 14:48:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-30 14:48:31 +0200 |
| commit | 2409000a0cad2242fd4e2578f761f97069625478 (patch) | |
| tree | fd5e5851599aeb1c0707540f919a476848e21e0b /drivers | |
| parent | ada0629bd3135504680fc787cb4dc79f43ff4441 (diff) | |
| parent | bc09c0654c61fac1272436c194ebc563e55cd062 (diff) | |
| parent | 27565c9e22ddd158f918456b2712a06b05b4da5e (diff) | |
| parent | aadfa206e9bb6fcee0b9fcd2fc39804026cdefcc (diff) | |
| download | linux-2409000a0cad2242fd4e2578f761f97069625478.tar.bz2 | |
Merge branches 'pm-devfreq', 'powercap' and 'pm-docs'
* pm-devfreq:
PM / devfreq: Get rid of some doc warnings
PM / devfreq: Fix handling dev_pm_qos_remove_request result
PM / devfreq: Fix a typo in a comment
PM / devfreq: Change to DEVFREQ_GOV_UPDATE_INTERVAL event name
PM / devfreq: Remove unneeded extern keyword
PM / devfreq: Use constant name of userspace governor
* powercap:
powercap: idle_inject: Replace zero-length array with flexible-array member
* pm-docs:
docs: cpu-freq: convert cpufreq-stats.txt to ReST
docs: cpu-freq: convert cpu-drivers.txt to ReST
docs: cpu-freq: convert core.txt to ReST
docs: cpu-freq: convert index.txt to ReST
docs: cpufreq: fix a broken reference
Documentation: cpufreq: Move legacy driver documentation