diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 19:44:54 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 19:44:54 +0200 |
commit | 75acebf2423ab13ff6198daa6e17ef7a2543bfe4 (patch) | |
tree | e08119290aaf68ce1b5d2b4a4cbaba29c3b2f64d /drivers/net/usb/Makefile | |
parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | perf/x86: Fix uncore PCI fixed counter handling (diff) | |
download | linux-75acebf2423ab13ff6198daa6e17ef7a2543bfe4.tar.xz linux-75acebf2423ab13ff6198daa6e17ef7a2543bfe4.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:
"Various fixes.
The -g perf report lockup you reported is only partially addressed,
patches that fix the excessive runtime are still being worked on"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Fix uncore PCI fixed counter handling
uprobes: Fix utask->depth accounting in handle_trampoline()
perf/x86: Add constraint for IVB CYCLE_ACTIVITY:CYCLES_LDM_PENDING
perf: Fix up MMAP2 buffer space reservation
perf tools: Add attr->mmap2 support
perf kvm: Fix sample_type manipulation
perf evlist: Fix id pos in perf_evlist__open()
perf trace: Handle perf.data files with no tracepoints
perf session: Separate progress bar update when processing events
perf trace: Check if MAP_32BIT is defined
perf hists: Fix formatting of long symbol names
perf evlist: Fix parsing with no sample_id_all bit set
perf tools: Add test for parsing with no sample_id_all bit
perf trace: Check control+C more often
Diffstat (limited to 'drivers/net/usb/Makefile')
0 files changed, 0 insertions, 0 deletions