From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 23 Aug 2021 11:50:41 +0000 (+0200)
Subject: Merge branches 'pm-em' and 'powercap' into linux-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b9a125f52807b2d2120517094743f21a1270b608;p=users%2Fjedix%2Flinux-maple.git

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
---

b9a125f52807b2d2120517094743f21a1270b608