Merge branches 'acpi-scan', 'acpi-osl' and 'acpi-apei'