]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'pm-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Mar 2022 16:53:28 +0000 (18:53 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Mar 2022 16:53:28 +0000 (18:53 +0200)
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

1  2 
Documentation/admin-guide/pm/amd-pstate.rst
MAINTAINERS

diff --cc MAINTAINERS
Simple merge