Merge branches 'thermal-soc-misc' and 'thermal-soc-qoriq' into thermal-soc
authorZhang Rui <rui.zhang@intel.com>
Wed, 28 Aug 2019 13:09:00 +0000 (21:09 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 28 Aug 2019 13:09:00 +0000 (21:09 +0800)

Trivial merge