Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:34:56 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:34:56 +0000 (10:34 -0700)
commit4cba3335826cbb36a218c3f5a1387e2c7c7ca9aa
treef25a6a909464e088079902add80f5bc1d37cd99f
parent7e92daaefa68e5ef1e1732e45231e73adbb724e7
parent402537fd9f5499d1a50a6f20cdd9031d24ee2e47
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fix from Ingo Molnar:
 "Leftover perf/urgent fix from the v3.6 cycle"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix typo in uncore_pmu_to_box
arch/x86/kernel/cpu/perf_event_intel_uncore.c