summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2015-11-06 09:32:10 +0800
committerZhang Rui <rui.zhang@intel.com>2015-11-06 09:32:10 +0800
commit7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30 (patch)
tree50cd98e26a1e426e7433c68ea257beb241d7fc62 /tools
parent809b6ecb53e35654d988f8f8f263a51ac6d10003 (diff)
parent98cadf25dae234130994d9c71cd0d925db4b2a6a (diff)
parentc422a8ed6fb5ba0c318ae8b31f881e9f2f2f65a1 (diff)
downloadlinux-7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30.tar.bz2
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next