tree cd7987ec7ca9c9dc470492bbd2f9391b030abd73
parent a15b8cd77512fd24920f3a6fe1c85f896fb775e8
parent 1ac5e21d43b2325854cf3b36b1509b28468dc6fd
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1638551372 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1638551372 +0100

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