Merge branch 'linus' into tracing/kmemtrace2

author Ingo Molnar <mingo@elte.hu>

Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)

committer Ingo Molnar <mingo@elte.hu>

Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)
author Ingo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)
committer Ingo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
diff --cc kernel/trace/trace_functions_graph.c
Simple merge
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_functions_graph.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slab.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history