From: Zhang Rui Date: Wed, 30 May 2018 06:54:20 +0000 (+0800) Subject: Merge branches 'thermal-core' and 'thermal-intel' into next X-Git-Tag: v4.18-rc1~40^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e9ed3ee61aa62ce280aadeeea1ec959f0c66a290;p=linux.git Merge branches 'thermal-core' and 'thermal-intel' into next --- e9ed3ee61aa62ce280aadeeea1ec959f0c66a290