summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2016-05-18 09:37:08 +0200
committerZhang Rui <rui.zhang@intel.com>2016-05-18 09:37:08 +0200
commit88ac99063e6e38bf9577e75f0d65dd02e2326d58 (patch)
treeb04a8677c0bbd2c64d0dfe3957bf32287813a148 /drivers/thermal
parentthermal: check validity get_trip_hyst function pointer in bang-bang governor (diff)
parentthermal: x86_pkg_temp: Handle the FROZEN hot plug notifier actions. (diff)
parentthermal: tango: initialize TEMPSI_CFG (diff)
downloadlinux-88ac99063e6e38bf9577e75f0d65dd02e2326d58.tar.xz
linux-88ac99063e6e38bf9577e75f0d65dd02e2326d58.zip
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next