Merge branches 'acpi-scan', 'acpi-bus' and 'acpi-platform'