diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 15:48:38 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 15:48:38 +0300 |
| commit | 16641d81f9ff5f902d084754c84b2bde3a60bc6e (patch) | |
| tree | 15054183c8f132a45e22501833a424b49ac3608a /drivers/char/pcmcia/Makefile | |
| parent | 2cf9ba290536fa8c03018d073555488ae000d8ee (diff) | |
| parent | bf23e1cd46d6a3277aad5921e14eac40bf32b90a (diff) | |
| parent | 00610935158fcc812a6425b8bda3f87c8689b805 (diff) | |
| download | linux-16641d81f9ff5f902d084754c84b2bde3a60bc6e.tar.xz | |
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