Merge branches 'thermal-core' and 'thermal-intel' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 28 Jun 2019 01:15:17 +0000 (09:15 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 28 Jun 2019 01:15:17 +0000 (09:15 +0800)
commitff9b011ad14319a3189efd033796410a48b23cde
tree91aaf7498f8379d889bad409f5026babc92609ca
parent6bbe6f5732faeabb4bb583726ec2d7f9739532bd
parentaaba9791fbb4c5c5af86ea296f5b8d577aa293d8
Merge branches 'thermal-core' and 'thermal-intel' into next