diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2019-09-24 09:56:37 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2019-09-24 09:56:37 +0800 |
| commit | 0f84d1d18c46d0f995962c876c8b2900fd183fd7 (patch) | |
| tree | 07448f72b2f0189bde66a38380367be5809706dc | |
| parent | bf8ca04d8bfdb64b10a8fc8a08013aeb8ad1fb10 (diff) | |
| parent | 97e9cafe85a9111fd72cefb18cfc9f2e0b6f85f1 (diff) | |
| parent | 6b221b0af7502a58684e8798d1d65efbd7d30350 (diff) | |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into for-5.4