diff options
author | Zhang Rui <rui.zhang@intel.com> | 2017-11-02 09:32:25 +0100 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2017-11-02 09:32:25 +0100 |
commit | 1e032393d9680c1f3b5238ec0f3f4eb006ee83d2 (patch) | |
tree | da2ce086d804a68b8eee453921026037637a9ed2 /drivers/thermal/ti-soc-thermal | |
parent | thermal : Remove const to make same prototype (diff) | |
parent | tools/thermal: tmon: use $(PKG_CONFIG) instead of hard-coding pkg-config (diff) | |
parent | thermal: pch: Add Cannon Lake support (diff) | |
parent | Merge branch 'imx-nvmem' into thermal-soc (diff) | |
download | linux-1e032393d9680c1f3b5238ec0f3f4eb006ee83d2.tar.xz linux-1e032393d9680c1f3b5238ec0f3f4eb006ee83d2.zip |
Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next