]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit3b65dd5be3c72b9d2013bfe6e9261e2b06222fa9
tree23295802e9089b6869cf9e426de7483491760a19
parent79bc8bface8767078d6803debaef54f044117731
parent7000ef38052b219583f17a10ef2e7ca99b5e585e
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
Documentation/admin-guide/pm/amd-pstate.rst
MAINTAINERS