]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7201735 7fcc17d 5d4c779)
Merge branches 'pm-em' and 'powercap' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 23 Aug 2021 11:50:41 +0000 (13:50 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 23 Aug 2021 11:50:41 +0000 (13:50 +0200)
* pm-em:
  PM: EM: Increase energy calculation precision

* powercap:
  powercap: intel_rapl: Replace deprecated CPU-hotplug functions


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.