diff options
author | Zhang Rui <rui.zhang@intel.com> | 2016-11-30 03:26:38 +0100 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2016-11-30 03:26:38 +0100 |
commit | 9245ac20d829dd3af164eb0e04d72d53939e88dd (patch) | |
tree | efdcd5700c4232595badbd3d636d0f279dd4cce6 /drivers/thermal | |
parent | thermal: hwmon: Properly report critical temperature in sysfs (diff) | |
parent | thermal/x86 pkg temp: Convert to hotplug state machine (diff) | |
parent | devfreq_cooling: pass a pointer to devfreq in the power model callbacks (diff) | |
parent | thermal: core: move slop and offset helpers to thermal_helpers.c (diff) | |
download | linux-9245ac20d829dd3af164eb0e04d72d53939e88dd.tar.xz linux-9245ac20d829dd3af164eb0e04d72d53939e88dd.zip |
Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal-reorg' into next