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: 4.18-rc1-smb3-fixes~40^2 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=e9ed3ee61aa62ce280aadeeea1ec959f0c66a290 Merge branches 'thermal-core' and 'thermal-intel' into next --- e9ed3ee61aa62ce280aadeeea1ec959f0c66a290