Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next