Merge branch 'acpi-cleanup'

Subsequent commits depend on the 'acpi-cleanup' material.