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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_governor.c
index dc9b72e25c1ab66c429fb65e9cb1d410ef4ee908,7532570c42b4bbd657b447956a692dbf98f84d4a..a849b2d499fa00abd99c186695555099abd941a5
--- 1/drivers/cpufreq/cpufreq_governor.c
--- 2/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"