Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux...

Conflicts:
	drivers/thermal/cpu_cooling.c

diff --cc drivers/thermal/cpu_cooling.c
index be2e6b0e5349ad8f36ea713f5250312c3716f9a1,e03891b03c9b22245403795fb22b1c6ea6b35879..5f5c780bcd9040e8ddd3e43fbb9e21e105d24224
--- 1/drivers/thermal/cpu_cooling.c
--- 2/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@@ -235,31 -301,19 +301,19 @@@ static int cpufreq_get_max_state(struc
                                 unsigned long *state)
  {
        struct cpufreq_cooling_device *cpufreq_device = cdev->devdata;
 -      struct cpumask *maskPtr = &cpufreq_device->allowed_cpus;
 +      struct cpumask *mask = &cpufreq_device->allowed_cpus;
        unsigned int cpu;
-       struct cpufreq_frequency_table *table;
        unsigned long count = 0;
-       int i = 0;
+       int ret;
  
 -      cpu = cpumask_any(maskPtr);
 +      cpu = cpumask_any(mask);
-       table = cpufreq_frequency_get_table(cpu);
-       if (!table) {
-               *state = 0;
-               return 0;
-       }
  
-       for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
-               if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
-                       continue;
-               count++;
-       }
+       ret = get_property(cpu, 0, (unsigned int *)&count, GET_MAXL);
  
-       if (count > 0) {
-               *state = --count;
-               return 0;
-       }
+       if (count > 0)
+               *state = count;
  
-       return -EINVAL;
+       return ret;
  }
  
  /**

diff --cc include/linux/thermal.h
Simple merge