Skip to content
Commit b9a125f5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 72017356 7fcc17d0 5d4c779c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment