Merge branch 'acpi-general'