Merge branches 'acpi-resources' and 'acpi-dptf'