From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 29 Mar 2022 16:53:28 +0000 (+0200)
Subject: Merge branch 'pm-docs'
X-Git-Tag: core-urgent-2022-04-03~18^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b65dd5be3c72b9d2013bfe6e9261e2b06222fa9;p=users%2Fdwmw2%2Flinux.git

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

3b65dd5be3c72b9d2013bfe6e9261e2b06222fa9