summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2016-11-30 03:26:38 +0100
committerZhang Rui <rui.zhang@intel.com>2016-11-30 03:26:38 +0100
commit9245ac20d829dd3af164eb0e04d72d53939e88dd (patch)
treeefdcd5700c4232595badbd3d636d0f279dd4cce6 /drivers/thermal
parentthermal: hwmon: Properly report critical temperature in sysfs (diff)
parentthermal/x86 pkg temp: Convert to hotplug state machine (diff)
parentdevfreq_cooling: pass a pointer to devfreq in the power model callbacks (diff)
parentthermal: core: move slop and offset helpers to thermal_helpers.c (diff)
downloadlinux-9245ac20d829dd3af164eb0e04d72d53939e88dd.tar.xz
linux-9245ac20d829dd3af164eb0e04d72d53939e88dd.zip
Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal-reorg' into next