aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-12 18:37:07 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-12 18:37:07 -0400
commit419a48ce8576e2617130bb6b6e20f824ddde1033 (patch)
tree366373840126aece71f471bf1019afd45d9ea9fd /drivers/acpi
parent17528b31c5e2b2d40bb52954af88849303ebb915 (diff)
parentb34ef932d79ac2a36e1d7ba2742e5d4ba54efa3c (diff)
parentbaa9a93a4412330a49245e69c5e8b22086656482 (diff)
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