diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-02-15 17:02:04 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-02-15 17:02:04 +0100 |
| commit | 332fd9005bd36b9e0277ea51027555cf223bd780 (patch) | |
| tree | 8ad655887912d057fa8b34f3fa7af45a6c5a8149 /kernel | |
| parent | f5c233c8fe8d24d9e536939f9ff4fa8c359bdd32 (diff) | |
| parent | 91a4b9e619c1b8870c8b76ad7c19c82523235ca6 (diff) | |
| parent | a51d185681802e48113424a299ff188eeb193e2d (diff) | |
Merge branches 'pm-devfreq' and 'pm-tools'
* pm-devfreq:
PM / devfreq: rk3399_dmc: Remove unneeded semicolon
PM / devfreq: Replace devfreq->dev.parent as dev in devfreq_add_device
PM / devfreq: Correct spelling in a comment
* pm-tools:
cpupower: Add cpuid cap flag for MSR_AMD_HWCR support
cpupower: Remove family arg to decode_pstates()
cpupower: Condense pstate enabled bit checks in decode_pstates()
cpupower: Update family checks when decoding HW pstates
cpupower: Remove unused pscur variable.
cpupower: Add CPUPOWER_CAP_AMD_HW_PSTATE cpuid caps flag
cpupower: Correct macro name for CPB caps flag
cpupower: Update msr_pstate union struct naming
cpupower: add Makefile dependencies for install targets