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

author Ingo Molnar <mingo@elte.hu>

Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)

committer Ingo Molnar <mingo@elte.hu>

Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)
author Ingo Molnar <mingo@elte.hu>
Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)
committer Ingo Molnar <mingo@elte.hu>
Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)
diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge
diff --cc kernel/perf_event.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)
		1	2
arch/x86/kernel/cpu/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history