Merge branches 'acpi-pci', 'acpi-irq' and 'acpi-assorted'