From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 11 Sep 2020 14:46:01 +0000 (+0200)
Subject: Merge branch 'powercap'
X-Git-Tag: v5.9-rc5~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d64e6906d188f0ba6a4f82b3f42e0bd0598183fa;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'powercap'

* powercap:
  powercap: make documentation reflect code
  powercap/intel_rapl: add support for AlderLake
  powercap/intel_rapl: add support for RocketLake
  powercap/intel_rapl: add support for TigerLake Desktop
---

d64e6906d188f0ba6a4f82b3f42e0bd0598183fa