aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zhang Rui <rui.zhang@intel.com> 2017-11-02 16:32:25 +0800
committerGravatar Zhang Rui <rui.zhang@intel.com> 2017-11-02 16:32:25 +0800
commit1e032393d9680c1f3b5238ec0f3f4eb006ee83d2 (patch)
treeda2ce086d804a68b8eee453921026037637a9ed2
parentthermal : Remove const to make same prototype (diff)
parenttools/thermal: tmon: use $(PKG_CONFIG) instead of hard-coding pkg-config (diff)
parentthermal: pch: Add Cannon Lake support (diff)
parentMerge branch 'imx-nvmem' into thermal-soc (diff)
downloadlinux-1e032393d9680c1f3b5238ec0f3f4eb006ee83d2.tar.gz
linux-1e032393d9680c1f3b5238ec0f3f4eb006ee83d2.tar.bz2
linux-1e032393d9680c1f3b5238ec0f3f4eb006ee83d2.zip
Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next