Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:47:33 +0000 (13:47 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:47:45 +0000 (13:47 +0200)
commit93776a8ec746cf9d32c36e5a5b23d28d8be28826
tree6c472ae9f709246ee5268e1d71559d07839fb965
parent34886c8bc590f078d4c0b88f50d061326639198d
parentd508afb437daee7cf07da085b635c44a4ebf9b38
Merge branch 'linus' into tracing/core

Merge reason: update to upstream tracing facilities

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