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 /arch/mips/kvm/mmu.c | |
| parent | Merge branch 'pm-opp' into pm (diff) | |
| parent | Merge tag 'devfreq-next-for-5.12' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Merge tag 'linux-cpupower-5.12-rc1' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-332fd9005bd36b9e0277ea51027555cf223bd780.tar.xz linux-332fd9005bd36b9e0277ea51027555cf223bd780.zip | |
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