Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

author Ingo Molnar <mingo@elte.hu>

Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)

committer Ingo Molnar <mingo@elte.hu>

Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)
author Ingo Molnar <mingo@elte.hu>
Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)
committer Ingo Molnar <mingo@elte.hu>
Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)
diff --cc include/linux/ftrace_event.h
Simple merge
diff --cc include/trace/ftrace.h
Simple merge
diff --cc kernel/perf_event.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)
		1	2
include/linux/ftrace_event.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/trace/ftrace.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history