From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 5 Mar 2021 15:19:10 +0000 (+0100)
Subject: Merge branch 'powercap'
X-Git-Tag: iomap-folio-5.17-old~1882^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7bff4c26b6d2c82bebf8630f31b1cca11b1bd562;p=users%2Fwilly%2Flinux.git

Merge branch 'powercap'

* powercap:
  powercap/drivers/dtpm: Add the experimental label to the option description
  powercap/drivers/dtpm: Fix root node initialization
---

7bff4c26b6d2c82bebf8630f31b1cca11b1bd562