Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Ingo Molnar [Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)]
1  2 
init/main.c
lib/Kconfig.debug
mm/slab.c
mm/slub.c

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