aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-07-05 15:01:06 +0800
committerZhang Rui <rui.zhang@intel.com>2017-07-05 15:01:06 +0800
commit5d72ed35678a351a1aed4b454c25d583f8bccb28 (patch)
treea0c034bb295e3e78304533d4dffb0a2d5022c974 /drivers/thermal
parentthermal: fix source code documentation for parameters (diff)
parentthermal: int340x: check for sensor when PTYP is missing (diff)
parentMerge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff)
downloadlinux-dev-5d72ed35678a351a1aed4b454c25d583f8bccb28.tar.xz
linux-dev-5d72ed35678a351a1aed4b454c25d583f8bccb28.zip
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next