From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 3 Mar 2023 17:26:43 +0000 (+0100)
Subject: Merge branch 'powercap'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5719638d368f35934d53e4a8c3a2f007c32a1ecf;p=users%2Fhch%2Fuuid.git

Merge branch 'powercap'

Merge additional power capping changes for 6.3-rc1:

 - Remove MODULE_LICENSE from non-modular power capping code (Nick
   Alcock).

 - Add Add Power Limit4 support for Meteor Lake SoC to the Intel RAPL
   power capping driver (Sumeet Pawnikar).

* powercap:
  powercap: remove MODULE_LICENSE in non-modules
  powercap: RAPL: Add Power Limit4 support for Meteor Lake SoC
---

5719638d368f35934d53e4a8c3a2f007c32a1ecf