| commit | e9ed3ee61aa62ce280aadeeea1ec959f0c66a290 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Wed May 30 14:54:20 2018 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Wed May 30 14:54:20 2018 +0800 |
| tree | 5a51e95537bf54ea7105cf705942cdd03420fe81 | |
| parent | 7e3c03817feccdf2b26722993825dc09377908b4 [diff] | |
| parent | ce7d35fa4e60b08ed3f3c568e9fa6cdabf753e7e [diff] |
Merge branches 'thermal-core' and 'thermal-intel' into next