Merge back power-related ACPI material for v4.12.