Merge branch 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 6 May 2017 11:31:19 +0000 (19:31 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 6 May 2017 11:31:19 +0000 (19:31 +0800)
1  2 
drivers/thermal/Kconfig

Simple merge