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)
commit0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6
treef0714ddcd02812b4fbe3b5405df9e4068f5587e2
parent925936ebf35a95c290e010b784c962164e6728f3
parent33974093c024f08caadd2fc71a83bd811ed1831d
Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up latest fixes and update to latest upstream.

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