Merge branches 'thermal-core' and 'thermal-intel' into next
authorZhang Rui <[email protected]>
Wed, 30 May 2018 06:54:20 +0000 (14:54 +0800)
committerZhang Rui <[email protected]>
Wed, 30 May 2018 06:54:20 +0000 (14:54 +0800)

Trivial merge