Merge branches 'acpi-scan', 'acpi-pm', 'acpi-power' and 'acpi-pci'