Merge branches 'pm-cpufreq', 'intel_pstate' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Jul 2017 12:21:18 +0000 (14:21 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Jul 2017 12:21:18 +0000 (14:21 +0200)
commitf1c7842e5fdd81363643debcd04c5e9b9a55325a
treedf08ff27c2da00304bb155926256367d2443e659
parent16b5b092407d3fbe23431ca58804fd1481f811b2
parent73808d0fd26b3d3f0f44cc7c469ad1d3c1b570b8
parent8183003e48cbb9d6d276b6330eb5edecf95830f3
parent3ed09c94580de9d5b18cc35d1f97e9f24cd9233b
Merge branches 'pm-cpufreq', 'intel_pstate' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq / CPPC: Initialize policy->min to lowest nonlinear performance
  cpufreq: sfi: make freq_table static
  cpufreq: exynos5440: Fix inconsistent indenting
  cpufreq: imx6q: imx6ull should use the same flow as imx6ul
  cpufreq: dt: Add support for hi3660

* intel_pstate:
  cpufreq: Update scaling_cur_freq documentation
  cpufreq: intel_pstate: Clean up after performance governor changes
  intel_pstate: skip scheduler hook when in "performance" mode
  intel_pstate: delete scheduler hook in HWP mode
  x86: use common aperfmperf_khz_on_cpu() to calculate KHz using APERF/MPERF
  cpufreq: intel_pstate: Remove max/min fractions to limit performance
  x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz"

* pm-cpuidle:
  cpuidle: menu: allow state 0 to be disabled
  intel_idle: Use more common logging style
  x86/ACPI/cstate: Allow ACPI C1 FFH MWAIT use on AMD systems
  ARM: cpuidle: Support asymmetric idle definition
drivers/cpufreq/intel_pstate.c