From: Zhang Rui <rui.zhang@intel.com>
Date: Fri, 13 Apr 2018 06:11:53 +0000 (+0800)
Subject: Merge branches 'thermal-core' and 'thermal-soc' into next
X-Git-Tag: v4.17-rc1~15^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b907b408ca64482989cd95dacef804ce509a3673;p=thirdparty%2Flinux.git

Merge branches 'thermal-core' and 'thermal-soc' into next
---

b907b408ca64482989cd95dacef804ce509a3673