Merge branches 'acpi-scan', 'acpi-osl', 'acpi-osi' and 'acpi-tables'