Ingo Molnar a1922ed661 Merge branch 'tracing/core' into tracing/hw-breakpoints ...

Conflicts:
	arch/Kconfig
	kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
              ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-09-07 08:19:51 +02:00

18 KiB

Raw Blame History

View Raw