Merge branches 'thermal-core' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 13 Apr 2018 06:11:53 +0000 (14:11 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 13 Apr 2018 06:11:53 +0000 (14:11 +0800)

Trivial merge