From: Tejun Heo Date: Mon, 2 May 2011 12:16:37 +0000 (+0200) Subject: Merge branch 'x86/urgent' into x86-mm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 --- ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016