projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7031281 68efa37)
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)
commit96200591a34f8ecb98481c626125df43a2463b55
tree314c376b01f254d04f9aaf449b1f9147ad177fa6tree | snapshot
parent7031281e02bf951a2259849217193fb9d75a9762commit | diff
parent68efa37df779b3e04280598e8b5b3a1919b65feecommit | 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
John Crispins staging tree