Merge branch 'acpi-bus'