From: Zhang Rui Date: Wed, 28 Aug 2019 13:09:00 +0000 (+0800) Subject: Merge branches 'thermal-soc-misc' and 'thermal-soc-qoriq' into thermal-soc X-Git-Tag: ceph-for-5.4-rc4~99^2^3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b221b0af7502a58684e8798d1d65efbd7d30350;p=ceph-client.git Merge branches 'thermal-soc-misc' and 'thermal-soc-qoriq' into thermal-soc --- 6b221b0af7502a58684e8798d1d65efbd7d30350