Merge branches 'acpi-scan-fixes' and 'acpica-fixes'