Merge branch 'tracing/urgent' into tracing/core
Ingo Molnar [Thu, 29 Oct 2009 08:02:15 +0000 (09:02 +0100)]
Merge reason: Pick up fixes and move base from -rc1 to -rc5.

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

1  2 
Documentation/kernel-parameters.txt
arch/s390/kernel/ftrace.c
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_syscalls.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge