summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2016-03-15 02:54:06 +0300
committerZhang Rui <rui.zhang@intel.com>2016-03-15 02:54:06 +0300
commitb82ddd48e8bc01cd7bfc8511dc31778c5c4ebe6e (patch)
tree5f0bb0439362d38c9bedf67869fae9fbb202ede7 /drivers/thermal
parentd0b45880b2981e4b0edf1ce873114bf4e57061d5 (diff)
parent4cba7d23633c8ecb55460f0c614c3d57af0d8c08 (diff)
parent032f4a1e5a307c63b5ac27298ea82eb328f40ccc (diff)
downloadlinux-b82ddd48e8bc01cd7bfc8511dc31778c5c4ebe6e.tar.xz
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next