From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Oct 2012 17:34:56 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.7-rc1~194
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4cba3335826cbb36a218c3f5a1387e2c7c7ca9aa;p=~emulex%2Finfiniband.git

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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
---

4cba3335826cbb36a218c3f5a1387e2c7c7ca9aa