Merge branch 'acpi-thermal'