Merge back earlier power capping changes for v5.17
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 27 Dec 2021 15:51:12 +0000 (16:51 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 27 Dec 2021 15:51:12 +0000 (16:51 +0100)

Trivial merge