From: Zhang Rui <rui.zhang@intel.com>
Date: Wed, 24 Dec 2014 02:38:30 +0000 (+0800)
Subject: Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next
X-Git-Tag: v3.19-rc3~24^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7429b1e0d00e62426c74a45195ba72149cb9ad64;p=platform%2Fkernel%2Flinux-exynos.git

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

7429b1e0d00e62426c74a45195ba72149cb9ad64
diff --cc drivers/thermal/cpu_cooling.c
index 588185a,9b45f64,ad09e51..f65f0d1
--- a/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;