Merge branches 'acpi-cppc', 'acpi-misc', 'acpi-battery' and 'acpi-ac'