Merge remote-tracking branch 'thermal/next'

Conflicts:
	drivers/cpufreq/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/cpufreq/Kconfig
index 386dbc9ccdfdc36a1dca49ca917cbd6423922081,6b8cde5f98af3031655a21e5828162b4ece5fb93..814f9c80516bc90f293a768e4b9214b9e26f322a
--- 1/drivers/cpufreq/Kconfig
--- 2/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@@ -181,8 -181,7 +181,8 @@@ config CPU_FREQ_GOV_CONSERVATIV
  
  config GENERIC_CPUFREQ_CPU0
        tristate "Generic CPU0 cpufreq driver"
-       depends on HAVE_CLK && REGULATOR && OF
 -      depends on HAVE_CLK && REGULATOR && PM_OPP && OF && THERMAL && CPU_THERMAL
++      depends on HAVE_CLK && REGULATOR && OF && THERMAL && CPU_THERMAL
 +      select PM_OPP
        help
          This adds a generic cpufreq driver for CPU0 frequency management.
          It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)

diff --cc drivers/cpufreq/cpufreq-cpu0.c
index bb7b3082efb393d0a22181881d811b6070f5ba35,91c7bb67bc742c96d5b612f021533b223feb4520..0c12ffc0ebcbf2a5daad62e4a47674fdcedadf75
--- 1/drivers/cpufreq/cpufreq-cpu0.c
--- 2/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@@ -29,7 -32,13 +32,8 @@@ static struct device *cpu_dev
  static struct clk *cpu_clk;
  static struct regulator *cpu_reg;
  static struct cpufreq_frequency_table *freq_table;
+ static struct thermal_cooling_device *cdev;
  
 -static unsigned int cpu0_get_speed(unsigned int cpu)
 -{
 -      return clk_get_rate(cpu_clk) / 1000;
 -}
 -
  static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index)
  {
        struct dev_pm_opp *opp;