Merge branch 'tracing/core' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 15 Oct 2009 09:33:56 +0000 (11:33 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 15 Oct 2009 09:34:00 +0000 (11:34 +0200)
commit713490e02eed242b4c1c672b3c0c8b708f8b6f1d
tree8485759cfc112366d2485f473ad348a1c714f421
parentc4dc775f53136cd6af8f88bce67cce9b42751768
parent1beee96bae0daf7f491356777c3080cc436950f5
Merge branch 'tracing/core' into perf/core

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>
Documentation/kernel-parameters.txt
arch/s390/kernel/ftrace.c
kernel/trace/trace_events.c
kernel/trace/trace_syscalls.c