Merge branch 'eduardo-soc-thermal' into thermal-soc