Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc'...
authorZhang Rui <rui.zhang@intel.com>
Thu, 2 Nov 2017 08:32:25 +0000 (16:32 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 2 Nov 2017 08:32:25 +0000 (16:32 +0800)

Trivial merge