Merge branches 'pm-avs' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 Oct 2020 12:48:38 +0000 (14:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 Oct 2020 12:48:38 +0000 (14:48 +0200)
* pm-avs:
  MAINTAINERS: drop myself from PM AVS drivers
  PM: AVS: qcom-cpr: simplify the return expression of cpr_disable()

* powercap:
  powercap: include header to fix -Wmissing-prototypes

1  2  3 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge