Merge branch 'acpi-numa'