Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next

diff --cc drivers/thermal/cpu_cooling.c
index 588185abeab05ec3c3a36137ca4a451af9d16c4b,9b45f6426f44c010f5542b2de4366b29fd9dbf20,ad09e51ffae4d097109241d9a19b97c97858109b..f65f0d109fc8c015869a78b355478afb153fde5d
--- 1/drivers/thermal/cpu_cooling.c
--- 2/drivers/thermal/cpu_cooling.c
--- 3/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@@@ -38,12 -54,12 -38,11 +54,13 @@@@
    *   cooling devices.
    * @cpufreq_val: integer value representing the absolute value of the clipped
    *   frequency.
+ + * @max_level: maximum cooling level. One less than total number of valid
+ + *   cpufreq frequencies.
    * @allowed_cpus: all the cpus involved for this cpufreq_cooling_device.
 ++ * @node: list_head to link all cpufreq_cooling_device together.
    *
- - * This structure is required for keeping information of each
- - * cpufreq_cooling_device registered. In order to prevent corruption of this a
- - * mutex lock cooling_cpufreq_lock is used.
+ + * This structure is required for keeping information of each registered
+ + * cpufreq_cooling_device.
    */
   struct cpufreq_cooling_device {
        int id;