From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 3 Dec 2021 17:09:32 +0000 (+0100)
Subject: Merge branch 'powercap'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=404c91218703d58c8f442aa01e4ae558f14c0e20;p=linux.git

Merge branch 'powercap'

Merge DTPM fixes for 5.16-rc4.

* powercap:
  powercap: DTPM: Drop unused local variable from init_dtpm()
  powercap/drivers/dtpm: Disable DTPM at boot time
---

404c91218703d58c8f442aa01e4ae558f14c0e20