Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next

author Zhang Rui <rui.zhang@intel.com>

Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)

committer Zhang Rui <rui.zhang@intel.com>

Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)
author Zhang Rui <rui.zhang@intel.com>
Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)
committer Zhang Rui <rui.zhang@intel.com>
Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)
diff --cc drivers/thermal/thermal_core.c
Simple merge
author	Zhang Rui <rui.zhang@intel.com>
	Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)
committer	Zhang Rui <rui.zhang@intel.com>
	Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)