diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-26 10:28:34 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-26 10:28:34 +0100 |
commit | e350b60f4e0f089f585d738e27213c8133fe9093 (patch) | |
tree | 008cfe57fe68d3fa8c8d318de1efe32fdb63bbc1 /lib | |
parent | 5a97aa5bbcc1249df2a6fd5d32a477f6981ccba6 (diff) | |
parent | 2079fe6ea8cbd2fb2fbadba911f1eca6c362eb9b (diff) | |
parent | 1992b66d2f55cf36a14072cfd977fdf4f0d2f2c2 (diff) | |
parent | 9581e24c3f006edcc515cd1b317876d37769166f (diff) | |
download | linux-e350b60f4e0f089f585d738e27213c8133fe9093.tar.gz |
Merge branches 'pm-avs', 'pm-docs' and 'pm-tools'
* pm-avs: ARM: OMAP2+: SmartReflex: add omap_sr_pdata definition power: avs: smartreflex: Remove superfluous cast in debugfs_create_file() call * pm-docs: PM: Wrap documentation to fit in 80 columns * pm-tools: cpupower: ToDo: Update ToDo with ideas for per_cpu_schedule handling cpupower: mperf_monitor: Update cpupower to use the RDPRU instruction cpupower: mperf_monitor: Introduce per_cpu_schedule flag cpupower: Move needs_root variable into a sub-struct cpupower : Handle set and info subcommands correctly pm-graph info added to MAINTAINERS tools/power/cpupower: Fix initializer override in hsw_ext_cstates