Merge branches 'acpi-wdat' and 'acpi-cppc'