Merge branch 'tracing/sysprof' into auto-ftrace-next

author Ingo Molnar <mingo@elte.hu>

Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)

committer Ingo Molnar <mingo@elte.hu>

Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)
author Ingo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)
committer Ingo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)
diff --cc kernel/trace/Makefile
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
diff --cc kernel/trace/trace_selftest.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)
		1	2
kernel/trace/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_selftest.c	patch \|	diff1 \|	diff2 \|	blob \| history