Merge branch 'acpi-processor' into acpi