From: Ingo Molnar Date: Wed, 16 Feb 2011 08:44:04 +0000 (+0100) Subject: Merge branch 'x86/numa' into x86/mm X-Git-Tag: v2.6.39-rc1~499^2~54 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52b8b8d7251f8f7b8ed4a6c623618106d83e18b5;p=pandora-kernel.git Merge branch 'x86/numa' into x86/mm Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts. Signed-off-by: Ingo Molnar --- 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 Reading git-diff-tree failed