Merge branch 'acpi-cleanup'