Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'