commit | 4cba3335826cbb36a218c3f5a1387e2c7c7ca9aa | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 01 10:34:56 2012 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 01 10:34:56 2012 -0700 |
tree | f25a6a909464e088079902add80f5bc1d37cd99f | |
parent | 7e92daaefa68e5ef1e1732e45231e73adbb724e7 [diff] | |
parent | 402537fd9f5499d1a50a6f20cdd9031d24ee2e47 [diff] |
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