Ingo Molnar 96200591a3 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>

2009-11-21 14:07:23 +01:00

120 KiB

Raw Blame History

View Raw