Merge branch 'acpi-config'