Merge branch 'acpi-cca'