From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 27 Jun 2013 19:46:45 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq-assorted' into pm-cpufreq
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=39a95f4861381a87167729be8f71c59ed4efc27d;p=deliverable%2Flinux.git

Merge branch 'pm-cpufreq-assorted' into pm-cpufreq

* pm-cpufreq-assorted: (21 commits)
  cpufreq: powernow-k8: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: pcc: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: e_powersaver: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: ACPI: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: make __cpufreq_notify_transition() static
  cpufreq: Fix minor formatting issues
  cpufreq: Fix governor start/stop race condition
  cpufreq: Simplify userspace governor
  cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
  cpufreq: kirkwood: Select CPU_FREQ_TABLE option
  cpufreq: big.LITTLE needs cpufreq table
  cpufreq: SPEAr needs cpufreq table
  cpufreq: powerpc: Add cpufreq driver for Freescale e500mc SoCs
  cpufreq: remove unnecessary cpufreq_cpu_{get|put}() calls
  cpufreq: MAINTAINERS: Add git tree path for ARM specific updates
  cpufreq: rename index as driver_data in cpufreq_frequency_table
  cpufreq: Don't create empty /sys/devices/system/cpu/cpufreq directory
  cpufreq: Move get_cpu_idle_time() to cpufreq.c
  cpufreq: governors: Move get_governor_parent_kobj() to cpufreq.c
  cpufreq: Add EXPORT_SYMBOL_GPL for have_governor_per_policy
  ...
---

39a95f4861381a87167729be8f71c59ed4efc27d
diff --cc drivers/cpufreq/cpufreq_governor.c
index dc9b72e25c1a,7532570c42b4..a849b2d499fa
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@@ -23,10 -23,8 +23,9 @@@
  #include <linux/kernel_stat.h>
  #include <linux/mutex.h>
  #include <linux/slab.h>
- #include <linux/tick.h>
  #include <linux/types.h>
  #include <linux/workqueue.h>
 +#include <linux/cpu.h>
  
  #include "cpufreq_governor.h"