From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 28 Oct 2013 00:29:34 +0000 (+0100)
Subject: Merge branch 'pm-cpufreq'
X-Git-Tag: firefly_0821_release~176^2~4983^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=93658cb8597ab76655220be43d3d7f74c66e9e4e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-cpufreq'

* pm-cpufreq: (167 commits)
  cpufreq: create per policy rwsem instead of per CPU cpu_policy_rwsem
  intel_pstate: Add Baytrail support
  intel_pstate: Refactor driver to support CPUs with different MSR layouts
  cpufreq: Implement light weight ->target_index() routine
  PM / OPP: rename header to linux/pm_opp.h
  PM / OPP: rename data structures to dev_pm equivalents
  PM / OPP: rename functions to dev_pm_opp*
  cpufreq / governor: Remove fossil comment
  cpufreq: exynos4210: Use the common clock framework to set APLL clock rate
  cpufreq: exynos4x12: Use the common clock framework to set APLL clock rate
  cpufreq: Detect spurious invocations of update_policy_cpu()
  cpufreq: pmac64: enable cpufreq on iMac G5 (iSight) model
  cpufreq: pmac64: provide cpufreq transition latency for older G5 models
  cpufreq: pmac64: speed up frequency switch
  cpufreq: highbank-cpufreq: Enable Midway/ECX-2000
  exynos-cpufreq: fix false return check from "regulator_set_voltage"
  speedstep-centrino: Remove unnecessary braces
  acpi-cpufreq: Add comment under ACPI_ADR_SPACE_SYSTEM_IO case
  cpufreq: arm-big-little: use clk_get instead of clk_get_sys
  cpufreq: exynos: Show a list of available frequencies
  ...

Conflicts:
	drivers/devfreq/exynos/exynos5_bus.c
---

93658cb8597ab76655220be43d3d7f74c66e9e4e
diff --cc drivers/devfreq/exynos/exynos5_bus.c
index 93c29f4085bd,52835f12ac98..0e0bfc17cd5b
--- a/drivers/devfreq/exynos/exynos5_bus.c
+++ b/drivers/devfreq/exynos/exynos5_bus.c
@@@ -15,9 -15,10 +15,9 @@@
  #include <linux/module.h>
  #include <linux/devfreq.h>
  #include <linux/io.h>
- #include <linux/opp.h>
+ #include <linux/pm_opp.h>
  #include <linux/slab.h>
  #include <linux/suspend.h>
 -#include <linux/pm_opp.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/platform_device.h>