Merge back earlier ACPI thermal material.