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)
commit404c91218703d58c8f442aa01e4ae558f14c0e20
treecd7987ec7ca9c9dc470492bbd2f9391b030abd73
parenta15b8cd77512fd24920f3a6fe1c85f896fb775e8
parent1ac5e21d43b2325854cf3b36b1509b28468dc6fd
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