git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

Merge branch 'perf/urgent' into perf/core

Conflicts:
kernel/events/hw_breakpoint.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Linux Kernel Source Tree.

arch/x86/events/intel/ds.c	diff1 \|	diff2 \|	blob \| history
kernel/events/hw_breakpoint.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_probe.h	diff1 \|	diff2 \|	blob \| history