From: Zhang Rui Date: Fri, 7 Dec 2018 08:49:50 +0000 (+0800) Subject: Merge branches 'for-rc' and 'thermal-core' into next X-Git-Tag: v5.0-rc1~20^2~1 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=eaaa598c0a285ef3b0efa54e711a385269fe50ce Merge branches 'for-rc' and 'thermal-core' into next --- eaaa598c0a285ef3b0efa54e711a385269fe50ce