Merge branch 'acpi-soc' into pm-core