Merge branches 'thermal-soc-misc' and 'thermal-soc-qoriq' into thermal-soc
authorZhang Rui <rui.zhang@intel.com>
Wed, 28 Aug 2019 13:09:00 +0000 (21:09 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 28 Aug 2019 13:09:00 +0000 (21:09 +0800)
commit6b221b0af7502a58684e8798d1d65efbd7d30350
treeb377e6ca192b695665d2b29fddcdd3a7e9e56203
parent6b8249abb093551ef173d13a25ed0044d5dd33e0
parent11f787b0840e26648b5e01fad99bd2aa35098d5d
Merge branches 'thermal-soc-misc' and 'thermal-soc-qoriq' into thermal-soc