git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f435236 d25d01b)
Merge branch 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 3 Mar 2023 17:26:43 +0000 (18:26 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 3 Mar 2023 17:26:43 +0000 (18:26 +0100)
commit5719638d368f35934d53e4a8c3a2f007c32a1ecf
treee5134298a1e7563a67ae09421be0bf1dd9b6e7cftree
parentf43523620f646c89ffd8ada840a0068290e51266commit | diff
parentd25d01b4e59bde815df52a333f9b0f7558cc3281commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.