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

Merge branches 'misc' and 'powercap' 

* misc:
  MAINTAINERS: Reorder maintainer addresses for PM and ACPI

* powercap:
  powercap / intel_rapl: spell out SoC names
  powercap / intel_rapl: relax sanity check on energy counters
parents 6ac4a2ab 7fb06082 d6b2e6d0
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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