Merge branches 'x86/cleanups', 'x86/mm', 'x86/setup' and 'linus' into x86/core
Ingo Molnar [Fri, 20 Mar 2009 09:34:22 +0000 (10:34 +0100)]
1  2  3  4 
Makefile
kernel/module.c

diff --cc Makefile
Simple merge
diff --cc kernel/module.c
Simple merge