Merge branches 'for-rc' and 'thermal-core' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 7 Dec 2018 08:49:50 +0000 (16:49 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 7 Dec 2018 08:49:50 +0000 (16:49 +0800)

Trivial merge