Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 1 Oct 2009 09:20:33 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 1 Oct 2009 09:20:48 +0000 (11:20 +0200)
Merge reason: Pick up latest fixes and update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/trace/ftrace.c
kernel/trace/trace.h
kernel/trace/trace_events.c

Simple merge
Simple merge
Simple merge