Merge branch 'linus' into tracing/core
Ingo Molnar [Mon, 13 Apr 2009 22:02:16 +0000 (00:02 +0200)]
Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

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

1  2 
kernel/trace/Kconfig
kernel/trace/trace_events.c
kernel/trace/trace_events_filter.c
kernel/trace/trace_events_stage_2.h

Simple merge
Simple merge
Simple merge
Simple merge