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)
commit64233d2bd68646ae2793ba9e1ef95dcac0d1fec7
treecd7987ec7ca9c9dc470492bbd2f9391b030abd73
parent629ccbd2c7e88c2f9816366ff92363263cff03a4
parente8f560dda6dae1e42b0052f02f64406ade3cbf34
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