| commit | eaaa598c0a285ef3b0efa54e711a385269fe50ce | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Fri Dec 07 16:49:50 2018 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Fri Dec 07 16:49:50 2018 +0800 |
| tree | 6e33bb0f35d84eae9fc0cc8b88dae1570231eafe | |
| parent | 68000a0d983f539c95ebe5dccd4f29535c7ac0af [diff] | |
| parent | 72e9baf997286610a2a3109e79fdb528590c5523 [diff] |
Merge branches 'for-rc' and 'thermal-core' into next