Merge branches 'acpica' and 'acpi-scan'