Merge branch 'x86/urgent' into x86-mm

Merge reason: Pick up the following two fix commits.

  2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
  765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change

Scheduled NUMA init 32/64bit unification changes depend on these.

Signed-off-by: Tejun Heo <tj@kernel.org>

diff --cc arch/x86/mm/numa_64.c
Simple merge

diff --cc arch/x86/mm/srat_32.c
Simple merge

diff --cc drivers/acpi/processor_throttling.c
Simple merge