commit | d37479aac53d9e3d6e4b628a727a84021cbb4bd5 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 14 14:00:13 2015 -1000 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 14 14:00:13 2015 -1000 |
tree | fdc0432a3d25fb105ce5fe79ab799f8945f961cf | |
parent | 2fbbada1e1f321a0d525eae77d45acb56e7e9b52 [diff] | |
parent | 15c1247953e8a45232ed5a5540f291d2d0a77665 [diff] |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fixes from Ingo Molnar: "A regression fix for a crash, and a Intel HSW uncore PMU driver fix" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Revert "perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization" perf/x86/intel/uncore: Fix CBOX bit wide and UBOX reg on Haswell-EP