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

author Ingo Molnar <[email protected]>

Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)

committer Ingo Molnar <[email protected]>

Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
author Ingo Molnar <[email protected]>
Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
committer Ingo Molnar <[email protected]>
Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
diff --cc include/linux/perf_event.h
Simple merge
diff --cc kernel/perf_event.c
Simple merge
diff --cc kernel/trace/trace_functions_graph.c
Simple merge
author	Ingo Molnar <[email protected]>
	Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
committer	Ingo Molnar <[email protected]>
	Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
		1	2
include/linux/perf_event.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_functions_graph.c	patch \|	diff1 \|	diff2 \|	blob \| history