android_kernel_oneplus_msm8998/arch/x86/include
Ingo Molnar 52b8b8d725 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 <mingo@elte.hu>
2011-02-16 09:44:15 +01:00
..
asm Merge branch 'x86/numa' into x86/mm 2011-02-16 09:44:15 +01:00