| commit | ff9b011ad14319a3189efd033796410a48b23cde | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Fri Jun 28 09:15:17 2019 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Fri Jun 28 09:15:17 2019 +0800 |
| tree | 91aaf7498f8379d889bad409f5026babc92609ca | |
| parent | 6bbe6f5732faeabb4bb583726ec2d7f9739532bd [diff] | |
| parent | aaba9791fbb4c5c5af86ea296f5b8d577aa293d8 [diff] |
Merge branches 'thermal-core' and 'thermal-intel' into next