Merge branches 'acpi-ac' and 'acpi-tpm'