Merge branch 'tracing/core' into perf/core
Ingo Molnar [Thu, 15 Oct 2009 09:33:56 +0000 (11:33 +0200)]
Merge reason: to add event filter support we need the following
commits from the tracing tree:

 3f6fe06: tracing/filters: Unify the regex parsing helpers
 1889d20: tracing/filters: Provide basic regex support
 737f453: tracing/filters: Cleanup useless headers

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

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

Simple merge
Simple merge
Simple merge
Simple merge