Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools'