diff options
| author | Linus Torvalds <[email protected]> | 2015-04-03 17:38:36 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-04-03 17:38:36 +0000 |
| commit | ec2e76b4c73362231e7d6903e14fc9817d99f3ae (patch) | |
| tree | 07c0ef2fd7b3186f6273035887dca1c6a9583b81 /net/switchdev/switchdev.c | |
| parent | Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints (diff) | |
| download | kernel-ec2e76b4c73362231e7d6903e14fc9817d99f3ae.tar.gz kernel-ec2e76b4c73362231e7d6903e14fc9817d99f3ae.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two x86 Intel PMU constraint handling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints
perf/x86/intel: Filter branches for PEBS event
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions