Merge branch 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 3 Dec 2021 17:09:32 +0000 (18:09 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 3 Dec 2021 17:09:32 +0000 (18:09 +0100)
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


Trivial merge