Merge branch 'x86/numa' into x86-mm