]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d88a19b 86e61c7)
Merge branch 'tracing/hw-breakpoints' into perf/core
authorIngo Molnar <mingo@elte.hu>
Sat, 21 Nov 2009 13:07:23 +0000 (14:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 21 Nov 2009 13:07:23 +0000 (14:07 +0100)
commit68f88766893ca85bbaf0931260af52eb123b545e
tree314c376b01f254d04f9aaf449b1f9147ad177fa6tree | snapshot
parentd88a19bd179d2a4c21d6a7c46959c485ac4b06d1commit | diff
parent86e61c78597419ca5924d611f908f24a890f470acommit | diff
Merge branch 'tracing/hw-breakpoints' into perf/core

Conflicts:
arch/x86/kernel/kprobes.c
kernel/trace/Makefile

Merge reason: hw-breakpoints perf integration is looking
              good in testing and in reviews, plus conflicts
              are mounting up - so merge & resolve.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
12 files changed:
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/include/asm/processor.h diff1 | diff2 | blob | history
arch/x86/kernel/kprobes.c diff1 | diff2 | blob | history
arch/x86/kernel/process_64.c diff1 | diff2 | blob | history
arch/x86/kernel/ptrace.c diff1 | diff2 | blob | history
arch/x86/kvm/x86.c diff1 | diff2 | blob | history
include/linux/perf_event.h diff1 | diff2 | blob | history
kernel/exit.c diff1 | diff2 | blob | history
kernel/perf_event.c diff1 | diff2 | blob | history
kernel/trace/Kconfig diff1 | diff2 | blob | history
kernel/trace/Makefile diff1 | diff2 | blob | history
kernel/trace/trace.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.