]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit285bc7b2b8b105908919d21f0b3ed3a1324e305f
treef25a6a909464e088079902add80f5bc1d37cd99f
parent728b6324b1b82e1664bdca03b4cc50842acbcf48
parent591263b2b4465d2d8ccb739f2f8f0ed972dc7535
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
arch/x86/kernel/cpu/perf_event_intel_uncore.c