summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-07-05 10:01:06 +0300
committerZhang Rui <rui.zhang@intel.com>2017-07-05 10:01:06 +0300
commit5d72ed35678a351a1aed4b454c25d583f8bccb28 (patch)
treea0c034bb295e3e78304533d4dffb0a2d5022c974 /drivers/thermal
parent0d76d6e1eede5f2aa13695cb4c9d763bb3555e3e (diff)
parent4ca0e75e46b6ee408bdc334fff449323d476812c (diff)
parent467aebee872af7f5e703809e19a66de633a1aa2c (diff)
downloadlinux-5d72ed35678a351a1aed4b454c25d583f8bccb28.tar.xz
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next