diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2017-09-08 11:17:53 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-09-08 11:17:53 +0800 |
| commit | 7a348799d5d9087bbc2e60767f5e6da9f70cc7ca (patch) | |
| tree | 252139287ab054765a70ebbec4fc5c1ed08e553a | |
| parent | 6760f3f74e72d690bc47b8a1ca1716d2f2e4ad74 (diff) | |
| parent | eda519d5f73ed24a6d706094c30dedc403674a62 (diff) | |
| parent | 86da4391752c09f5f2b4a0d825466ec23e9da61f (diff) | |
Merge branches 'mediatek-mt2712', 'rockchip-rk3328' and 'uniphier-thermal' into thermal-soc