]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb2641870764c666b606722deeea847cfe020bc71
tree8485759cfc112366d2485f473ad348a1c714f421
parent2cb94ea3a63d2f5e9bee4e4fce47249b0e110d52
parent9a0d316b0f1d11d5733996851ac161db2ce90921
Merge branch 'tracing/core' into perf/core

Merge reason: to add event filter support we need the following
commits from the tracing tree:

 1ea183a: tracing/filters: Unify the regex parsing helpers
 2483d26: tracing/filters: Provide basic regex support
 8d20b83: 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