diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-02-07 11:01:40 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-02-07 11:01:40 +0100 |
| commit | 332008256f1f7cd8294acd6e288fb821f685d1a9 (patch) | |
| tree | 7ccbf727ec2a5d9c5dd20568dbb626e4f5106dcd /drivers/power | |
| parent | c21502efdaedfdf9fc71334883a164341881bc22 (diff) | |
| parent | e093e53f4f70b126ff63bc422e5135e934e35a1b (diff) | |
| parent | f06572ef476d368a239f0238ecf7b00b9cdbf5bf (diff) | |
| download | linux-332008256f1f7cd8294acd6e288fb821f685d1a9.tar.bz2 | |
Merge branches 'pm-avs' and 'pm-cpuidle'
* pm-avs:
power: avs: qcom-cpr: Avoid clang -Wsometimes-uninitialized in cpr_scale
power: avs: qcom-cpr: add unspecified HAS_IOMEM dependency
PM / AVS: rockchip-io: fix the supply naming for the emmc supply on px30
power: avs: qcom-cpr: add a printout after the driver has been initialized
* pm-cpuidle:
cpuidle: Documentation: Clean up PM QoS description
intel_idle: Introduce 'states_off' module parameter
intel_idle: Introduce 'use_acpi' module parameter