Merge branches 'acpi-scan', 'acpi-processor' and 'acpi-assorted'