Merge branch 'acpi-processor'