Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:32:10 +0000 (09:32 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:32:10 +0000 (09:32 +0800)
1  2  3 
drivers/thermal/Kconfig

Simple merge