alistair23-linux/samples
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
..
hw_breakpoint hw-breakpoints: sample HW breakpoint over kernel data address 2009-06-02 22:47:00 +02:00
kobject samples: mark {static|__init|__exit} for {init|exit} functions 2009-01-06 15:59:12 -08:00
kprobes
markers samples: mark {static|__init|__exit} for {init|exit} functions 2009-01-06 15:59:12 -08:00
trace_events tracing/events: Move TRACE_SYSTEM outside of include guard 2009-07-13 10:59:55 +02:00
tracepoints tracing: Documentation / sample code fixes for tracepoints 2009-03-24 22:32:12 +01:00
Kconfig Merge branch 'linus' into tracing/hw-breakpoints 2009-06-17 12:56:49 +02:00
Makefile hw-breakpoints: sample HW breakpoint over kernel data address 2009-06-02 22:47:00 +02:00