Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 13 Dec 2014 04:25:19 +0000 (12:25 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 13 Dec 2014 04:25:19 +0000 (12:25 +0800)
1  2  3 
include/linux/thermal.h

Simple merge