Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/ui/browsers/hists.c
Merge reason: fix the conflict and merge in changes for dependent patch.
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
No related branches found
No related tags found
Showing
- arch/arm/oprofile/common.c 5 additions, 2 deletionsarch/arm/oprofile/common.c
- arch/x86/kernel/Makefile 2 additions, 0 deletionsarch/x86/kernel/Makefile
- arch/x86/kernel/cpu/perf_event.c 11 additions, 1 deletionarch/x86/kernel/cpu/perf_event.c
- arch/x86/kernel/cpu/perf_event_p4.c 5 additions, 1 deletionarch/x86/kernel/cpu/perf_event_p4.c
- arch/x86/oprofile/nmi_int.c 1 addition, 0 deletionsarch/x86/oprofile/nmi_int.c
- tools/perf/Makefile 1 addition, 1 deletiontools/perf/Makefile
- tools/perf/util/trace-event-scripting.c 2 additions, 2 deletionstools/perf/util/trace-event-scripting.c
Loading
Please register or sign in to comment