From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 15 Jun 2013 22:32:11 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq-next' into linux-next
X-Git-Tag: next-20130617~79^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83486e6103c6ead05426c892d6062468276c47d9;p=karo-tx-linux.git

Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next:
  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
  cpufreq: tegra: Don't initialize .index field of cpufreq_frequency_table
---

83486e6103c6ead05426c892d6062468276c47d9
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"