Merge branch 'linus' into tracing/kmemtrace
Ingo Molnar [Wed, 31 Dec 2008 07:14:29 +0000 (08:14 +0100)]
Conflicts:
mm/slub.c

1  2 
MAINTAINERS
init/main.c
lib/Kconfig.debug
mm/Makefile
mm/slab.c
mm/slub.c

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