summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-02-22 08:35:06 +0100
committerZhang Rui <rui.zhang@intel.com>2017-02-22 08:35:06 +0100
commit6fefe19f583625ca4ea3ecc9128baa51c31c60a4 (patch)
tree48bbd4773378bc285f30edb813de8899cde0d245
parentthermal: use cpumask_var_t for on-stack cpu masks (diff)
parentpowerpc/mpc85xx: Update TMU device tree node for T1023/T1024 (diff)
parentthermal/intel_powerclamp: Remove set-but-not-used variables (diff)
parentthermal: convert devfreq_cooling to use an IDA (diff)
downloadlinux-6fefe19f583625ca4ea3ecc9128baa51c31c60a4.tar.xz
linux-6fefe19f583625ca4ea3ecc9128baa51c31c60a4.zip
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next