Merge branch 'acpi-apei'