summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-12-13 12:25:19 +0800
committerZhang Rui <rui.zhang@intel.com>2014-12-13 12:25:19 +0800
commit2707dbd09a859b7205917f9baf9d0192944ac46c (patch)
tree867352adee19affe11530c953dea3d89b27cad2a /drivers/thermal
parentaf6c9f1657ca6d2ef2b2c0e31ad17c6fbf773baf (diff)
parentc89d99546dc5b076ccd6692c48ada9a92820a4ac (diff)
parente413ad7cca9f541659ac0ddf8f37e2bcfade365a (diff)
downloadlinux-2707dbd09a859b7205917f9baf9d0192944ac46c.tar.bz2
Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next