Merge branch 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 11 May 2018 01:37:21 +0000 (09:37 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 11 May 2018 01:37:21 +0000 (09:37 +0800)

Trivial merge