diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-15 00:00:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-15 00:00:13 (GMT) |
| commit | d37479aac53d9e3d6e4b628a727a84021cbb4bd5 (patch) | |
| tree | fdc0432a3d25fb105ce5fe79ab799f8945f961cf /kernel | |
| parent | 2fbbada1e1f321a0d525eae77d45acb56e7e9b52 (diff) | |
| parent | 15c1247953e8a45232ed5a5540f291d2d0a77665 (diff) | |
| download | linux-d37479aac53d9e3d6e4b628a727a84021cbb4bd5.tar.xz | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions