| commit | bad94f8068122b6342a73a218dad7d41e6ea907b | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Fri Jan 20 16:24:54 2017 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Fri Jan 20 16:24:54 2017 +0800 |
| tree | 80e425d58f0052fddc1fb7e211c8f0a943cfb544 | |
| parent | f53345e8cf027d03187b9417f1f8883c516e1a5b [diff] | |
| parent | 6c75a5d1131eba90fcf04adc586167e65afc79b0 [diff] |
Merge branches 'thermal-core' and 'thermal-soc' into for-rc