Merge branch 'perf/x86-ibs' into perf/core

author Ingo Molnar <mingo@kernel.org>

Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)

committer Ingo Molnar <mingo@kernel.org>

Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)
author Ingo Molnar <mingo@kernel.org>
Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)
committer Ingo Molnar <mingo@kernel.org>
Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)
diff --cc arch/x86/include/asm/msr-index.h
Simple merge
diff --cc arch/x86/include/asm/perf_event.h
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 9 May 2012 13:22:23 +0000 (15:22 +0200)
		1	2
arch/x86/include/asm/msr-index.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/perf_event.h	patch \|	diff1 \|	diff2 \|	blob \| history