Merge branch 'tracing/urgent' into tracing/core
Ingo Molnar [Tue, 13 Oct 2009 07:24:51 +0000 (09:24 +0200)]
Merge reason: Pick up tracing/filters fix from the urgent queue,
              we will queue up dependent patches.

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

1  2 
kernel/trace/ftrace.c
kernel/trace/trace_events_filter.c

Simple merge
Simple merge