diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:48:38 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:48:38 +0200 |
commit | 16641d81f9ff5f902d084754c84b2bde3a60bc6e (patch) | |
tree | 15054183c8f132a45e22501833a424b49ac3608a /arch/arm/include/asm | |
parent | Merge branches 'pm-core', 'pm-sleep', 'pm-pci' and 'pm-domains' (diff) | |
parent | MAINTAINERS: drop myself from PM AVS drivers (diff) | |
parent | powercap: include header to fix -Wmissing-prototypes (diff) | |
download | linux-16641d81f9ff5f902d084754c84b2bde3a60bc6e.tar.xz linux-16641d81f9ff5f902d084754c84b2bde3a60bc6e.zip |
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