Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 23 Jan 2016 03:43:27 +0000 (11:43 +0800)
1  2  3 
drivers/thermal/thermal_core.c

Simple merge