diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-03 18:26:43 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-03 18:26:43 +0100 |
| commit | 5719638d368f35934d53e4a8c3a2f007c32a1ecf (patch) | |
| tree | e5134298a1e7563a67ae09421be0bf1dd9b6e7cf /kernel | |
| parent | cpufreq: apple-soc: Fix an IS_ERR() vs NULL check (diff) | |
| parent | powercap: remove MODULE_LICENSE in non-modules (diff) | |
| download | linux-5719638d368f35934d53e4a8c3a2f007c32a1ecf.tar.xz linux-5719638d368f35934d53e4a8c3a2f007c32a1ecf.zip | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions