Merge branches 'thermal-core' and 'thermal-intel' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 28 Jun 2019 01:15:17 +0000 (09:15 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 28 Jun 2019 01:15:17 +0000 (09:15 +0800)

Trivial merge