diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 21:34:21 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 21:34:21 +0400 |
commit | f78602ab7cbc902559406d2e8e21517056708295 (patch) | |
tree | b876f02dbb951337915ea202a4d92f09ed7a2a7f /drivers/infiniband/hw/amso1100/c2_rnic.c | |
parent | fb34438914188cc271d07a5fc2903489b6e9ab2d (diff) | |
parent | 26a4f3c08de49c1437a7b7f97693cf22d8c31656 (diff) | |
download | linux-f78602ab7cbc902559406d2e8e21517056708295.tar.xz |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 perf fixes from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: disable PEBS on a guest entry.
perf/x86: Add Intel Westmere-EX uncore support
perf/x86: Fixes for Nehalem-EX uncore driver
perf, x86: Fix uncore_types_exit section mismatch
Diffstat (limited to 'drivers/infiniband/hw/amso1100/c2_rnic.c')
0 files changed, 0 insertions, 0 deletions