Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next