Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 5 Jul 2017 07:01:06 +0000 (15:01 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 5 Jul 2017 07:01:06 +0000 (15:01 +0800)

Trivial merge