Ingo Molnar 15bcdc9477 Merge branch 'linus' into perf/core, to fix conflicts ... Conflicts: tools/perf/arch/arm/annotate/instructions.c tools/perf/arch/arm64/annotate/instructions.c tools/perf/arch/powerpc/annotate/instructions.c tools/perf/arch/s390/annotate/instructions.c tools/perf/arch/x86/tests/intel-cqm.c tools/perf/ui/tui/progress.c tools/perf/util/zlib.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-11-07 10:30:18 +01:00
..
common.h	Merge branch 'linus' into perf/core, to fix conflicts	2017-11-07 10:30:18 +01:00
core.c	Merge branch 'perf/urgent' into perf/core, to pick up fixes	2017-10-20 11:02:05 +02:00
ftrace.c	kprobes/x86: Remove IRQ disabling from ftrace-based/optimized kprobes	2017-09-28 09:25:50 +02:00
Makefile	kprobes/x86: Move kprobes stuff under arch/x86/kernel/kprobes/	2013-01-21 13:22:37 -05:00
opt.c	kprobes/x86: Remove IRQ disabling from ftrace-based/optimized kprobes	2017-09-28 09:25:50 +02:00