Merge branch 'perf/core'

author Ingo Molnar <mingo@kernel.org>

Wed, 19 Sep 2012 15:02:45 +0000 (17:02 +0200)

committer Ingo Molnar <mingo@kernel.org>

Wed, 19 Sep 2012 15:02:45 +0000 (17:02 +0200)
author Ingo Molnar <mingo@kernel.org>
Wed, 19 Sep 2012 15:02:45 +0000 (17:02 +0200)
committer Ingo Molnar <mingo@kernel.org>
Wed, 19 Sep 2012 15:02:45 +0000 (17:02 +0200)
diff --cc arch/x86/kernel/cpu/perf_event_intel_uncore.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Wed, 19 Sep 2012 15:02:45 +0000 (17:02 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 19 Sep 2012 15:02:45 +0000 (17:02 +0200)