Merge branches 'thermal-soc-misc' and 'thermal-soc-qoriq' into thermal-soc