From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 12 Apr 2015 22:37:07 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=419a48ce8576e2617130bb6b6e20f824ddde1033;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

* pm-cpufreq:
  intel_pstate: Knights Landing support
  intel_pstate: remove MSR test
  cpufreq: fix qoriq uniprocessor build
  cpufreq: hisilicon: add acpu driver
  cpufreq: powernv: Report cpu frequency throttling
  cpufreq: qoriq: rename the driver
  cpufreq: qoriq: Make the driver usable on all QorIQ platforms

* pm-cpuidle:
  intel_idle: mark cpu id array as __initconst
  intel_idle: Add support for the Airmont Core in the Cherrytrail and Braswell SOCs
  intel_idle: Update support for Silvermont Core in Baytrail SOC
  ARM: cpuidle: Document the code
  ARM: cpuidle: Register per cpuidle device
  ARM: cpuidle: Enable the ARM64 driver for both ARM32/ARM64
  ARM64: cpuidle: Remove arm64 reference
  ARM64: cpuidle: Rename cpu_init_idle to a common function name
  ARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function
  ARM: cpuidle: Add a cpuidle ops structure to be used for DT
  ARM: cpuidle: Remove duplicate header inclusion
---

419a48ce8576e2617130bb6b6e20f824ddde1033