Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2

author Ingo Molnar <mingo@elte.hu>

Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)
diff --cc init/main.c
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)
		1	2
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slab.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history