From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 15 Feb 2021 16:02:04 +0000 (+0100)
Subject: Merge branches 'pm-devfreq' and 'pm-tools'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=332fd9005bd36b9e0277ea51027555cf223bd780;p=linux.git

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
---

332fd9005bd36b9e0277ea51027555cf223bd780