Merge commit 'linus/master' into HEAD
Vegard Nossum [Mon, 15 Jun 2009 13:50:49 +0000 (15:50 +0200)]
Conflicts:
MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>

1  2 
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/traps.c
arch/x86/mm/init_32.c
include/linux/gfp.h
include/linux/interrupt.h
include/linux/slab.h
init/main.c
mm/slab.c
mm/slub.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge