tree 139f3aaa0b0680ec5447d155ec79115310160906
parent 7edcbbf29006be46d5dbce5bac9aae73f3056d14
parent 04dab58a39d402162a7effe7278df8cd41557252
parent 2849dd8bc72b62a315854863c84c523176bd55ce
parent 108c35a908d484df094f46a1e9d961d732737013
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1545383166 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1545383166 +0100

Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-cpufreq-sched'

* pm-cpuidle:
  cpuidle: Add 'above' and 'below' idle state metrics
  cpuidle: big.LITTLE: fix refcount leak
  cpuidle: Add cpuidle.governor= command line parameter
  cpuidle: poll_state: Disregard disable idle states
  Documentation: admin-guide: PM: Add cpuidle document

* pm-cpufreq:
  cpufreq: qcom-hw: Add support for QCOM cpufreq HW driver
  dt-bindings: cpufreq: Introduce QCOM cpufreq firmware bindings
  cpufreq: nforce2: Remove meaningless return
  cpufreq: ia64: Remove unused header files
  cpufreq: imx6q: save one condition block for normal case of nvmem read
  cpufreq: imx6q: remove unused code
  cpufreq: pmac64: add of_node_put()
  cpufreq: powernv: add of_node_put()
  Documentation: intel_pstate: Clarify coordination of P-State limits
  cpufreq: intel_pstate: Force HWP min perf before offline
  cpufreq: s3c24xx: Change to use DEFINE_SHOW_ATTRIBUTE macro

* pm-cpufreq-sched:
  sched/cpufreq: Add the SPDX tags