summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-09-08 06:20:04 +0300
committerZhang Rui <rui.zhang@intel.com>2017-09-08 06:20:04 +0300
commitb32b5e14b4e0d40e06f094d2593b447e00acdf37 (patch)
treeecac895abe3e38c81e0bd37ef3bd4902f2417344 /drivers/thermal
parent9d9ca1f9f04cf1d20427528cd3b3d05ebad47547 (diff)
parent7a348799d5d9087bbc2e60767f5e6da9f70cc7ca (diff)
parent9ef08d7a4438bb85856ee158f2b5e3e02c479279 (diff)
parent28e6c992eb898846df4d155d0d21bb354fd73564 (diff)
downloadlinux-b32b5e14b4e0d40e06f094d2593b447e00acdf37.tar.xz
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'const-thermal-zone-structure' into next