Merge branch 'topic/kmemtrace' of git://git.kernel.org/pub/scm/linux/kernel/git/penbe...

author Ingo Molnar <mingo@elte.hu>

Mon, 29 Dec 2008 14:16:24 +0000 (15:16 +0100)

committer Ingo Molnar <mingo@elte.hu>

Mon, 29 Dec 2008 14:16:24 +0000 (15:16 +0100)
author Ingo Molnar <mingo@elte.hu>
Mon, 29 Dec 2008 14:16:24 +0000 (15:16 +0100)
committer Ingo Molnar <mingo@elte.hu>
Mon, 29 Dec 2008 14:16:24 +0000 (15:16 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc init/main.c
Simple merge
diff --cc mm/slob.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 29 Dec 2008 14:16:24 +0000 (15:16 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 29 Dec 2008 14:16:24 +0000 (15:16 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slob.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history