Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 29 Oct 2009 08:02:15 +0000 (09:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 29 Oct 2009 08:02:20 +0000 (09:02 +0100)
commit9de09ace8d518141a4375e1d216ab64db4377799
treeda8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16
parent1beee96bae0daf7f491356777c3080cc436950f5
parent6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647
Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up fixes and move base from -rc1 to -rc5.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
arch/s390/kernel/ftrace.c
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_syscalls.c