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

author Ingo Molnar <mingo@elte.hu>

Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)

committer Ingo Molnar <mingo@elte.hu>

Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
author Ingo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
committer Ingo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/trace/ring_buffer.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
		1	2
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/ring_buffer.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history