summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-03-29 18:53:28 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-03-29 18:53:28 +0200
commit3b65dd5be3c72b9d2013bfe6e9261e2b06222fa9 (patch)
tree23295802e9089b6869cf9e426de7483491760a19 /MAINTAINERS
parent79bc8bface8767078d6803debaef54f044117731 (diff)
parent7000ef38052b219583f17a10ef2e7ca99b5e585e (diff)
downloadlinux-3b65dd5be3c72b9d2013bfe6e9261e2b06222fa9.tar.gz
Merge branch 'pm-docs'
Merge additional power management documentation udates for 5.18-rc1:

 - Add Intel uncore frequency scaling documentation file to its
   MAINTAINERS entry (Srinivas Pandruvada).

 - Clean up the AMD P-state driver documentation (Jan Engelhardt).

* pm-docs:
  Documentation: amd-pstate: grammar and sentence structure updates
  MAINTAINERS: Add additional file to uncore frequency control
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 881eebbd14ed..feb96aaa4b75 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9921,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