Merge branches 'thermal-core' and 'thermal-intel' into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 30 May 2018 06:54:20 +0000 (14:54 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 30 May 2018 06:54:20 +0000 (14:54 +0800)
commite9ed3ee61aa62ce280aadeeea1ec959f0c66a290
tree5a51e95537bf54ea7105cf705942cdd03420fe81
parent7e3c03817feccdf2b26722993825dc09377908b4
parentce7d35fa4e60b08ed3f3c568e9fa6cdabf753e7e
Merge branches 'thermal-core' and 'thermal-intel' into next