Merge branch 'x86/numa' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:44:04 +0000 (09:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:44:15 +0000 (09:44 +0100)
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge