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