Merge branch 'pm-docs'
[linux-2.6-microblaze.git] / MAINTAINERS
index c27a9ea..feb96aa 100644 (file)
@@ -1002,6 +1002,7 @@ L:        linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/admin-guide/pm/amd-pstate.rst
 F:     drivers/cpufreq/amd-pstate*
+F:     tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
 
 AMD PTDMA DRIVER
 M:     Sanjay R Mehta <sanju.mehta@amd.com>
@@ -9920,6 +9921,7 @@ INTEL UNCORE FREQUENCY CONTROL
 M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
+F:     Documentation/admin-guide/pm/intel_uncore_frequency_scaling.rst
 F:     drivers/platform/x86/intel/uncore-frequency.c
 
 INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
@@ -15970,14 +15972,15 @@ M:    Niklas Cassel <nks@flawful.org>
 L:     linux-pm@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
+F:     Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
 F:     drivers/soc/qcom/cpr.c
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 M:     Ilia Lin <ilia.lin@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
+F:     Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
+F:     Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml
 F:     drivers/cpufreq/qcom-cpufreq-nvmem.c
 
 QUALCOMM CRYPTO DRIVERS