Learn more about cloning repositories
You have read-only access
Merge branch 'perf/kprobes' into perf/core Conflicts: arch/x86/kernel/traps.c The kprobes enhancements are fully cooked, ship them upstream. Signed-off-by: Ingo Molnar <mingo@kernel.org>
