]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
commitb9a125f52807b2d2120517094743f21a1270b608
tree982746fbf6602fb4f91937a4b2b140c5f225eb69
parent72017356c21761d55f3fced8b0f5e0b0dfce73d1
parent7fcc17d0cb12938d2b3507973a6f93fc9ed2c7a1
parent5d4c779cb62e676aedc278de910b4bb8ef65a5cc
Merge branches 'pm-em' and 'powercap' into linux-next

* pm-em:
  PM: EM: Increase energy calculation precision

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