From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 7 Feb 2020 10:01:40 +0000 (+0100)
Subject: Merge branches 'pm-avs' and 'pm-cpuidle'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=332008256f1f7cd8294acd6e288fb821f685d1a9;p=linux.git

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

332008256f1f7cd8294acd6e288fb821f685d1a9