| commit | b907b408ca64482989cd95dacef804ce509a3673 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Fri Apr 13 14:11:53 2018 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Fri Apr 13 14:11:53 2018 +0800 |
| tree | 3c9a139b01367788f50cc3fcefb5d042d6051402 | |
| parent | 8ea229511e06f9635ecc338dcbe0db41a73623f0 [diff] | |
| parent | cf1ba1d73a33944d8c1a75370a35434bf146b8a7 [diff] |
Merge branches 'thermal-core' and 'thermal-soc' into next