Tejun Heo ba67cf5cf2 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>		2011-05-02 14:16:47 +02:00
..
asm	Merge branch 'x86/urgent' into x86-mm	2011-05-02 14:16:47 +02:00