Merge branch 'acpi-soc'