Merge branches 'acpi-dptf' and 'acpi-messages'