OSDN Git Service

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)
commit16641d81f9ff5f902d084754c84b2bde3a60bc6e
tree15054183c8f132a45e22501833a424b49ac3608a
parent2cf9ba290536fa8c03018d073555488ae000d8ee
parentbf23e1cd46d6a3277aad5921e14eac40bf32b90a
parent00610935158fcc812a6425b8bda3f87c8689b805
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
MAINTAINERS