admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
851a2c1082f874906c863522d901bfd8cf62cefb
linux/arch/x86/mm/numa_64.c
Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic 
Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-22 20:05:19 +01:00

21 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink