diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:06:06 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:06:06 +0100 |
| commit | 3a56fe685dc96ee0adb5958787ab9a2e24347e5a (patch) | |
| tree | 139f3aaa0b0680ec5447d155ec79115310160906 /kernel | |
| parent | 7edcbbf29006be46d5dbce5bac9aae73f3056d14 (diff) | |
| parent | 04dab58a39d402162a7effe7278df8cd41557252 (diff) | |
| parent | 2849dd8bc72b62a315854863c84c523176bd55ce (diff) | |
| parent | 108c35a908d484df094f46a1e9d961d732737013 (diff) | |
| download | linux-3a56fe685dc96ee0adb5958787ab9a2e24347e5a.tar.bz2 | |
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