From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 13 Oct 2020 12:48:38 +0000 (+0200)
Subject: Merge branches 'pm-avs' and 'powercap'
X-Git-Tag: io_uring-5.10-2020-10-20~75^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=16641d81f9ff5f902d084754c84b2bde3a60bc6e;p=linux-2.6-block.git

Merge branches 'pm-avs' and 'powercap'

* 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
---

16641d81f9ff5f902d084754c84b2bde3a60bc6e