Merge branch 'acpi-cleanup' into fixes