Merge branch 'acpi-conversion' into acpi-assorted