Merge branches 'acpi-x86', 'acpi-cppc' and 'acpi-soc'