]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 07:24:51 +0000 (09:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 07:24:59 +0000 (09:24 +0200)
commit41f6a997923208fe451e1555850b5d8651d0cd9a
tree45188f0ecb3f4bb7408a7219f8fcd041d500235a
parent6c7c6922d813eb7fa183c08bee025f7b59fa4eb5
parenta25d4febe3ce18922734239438d63860beb2289e
Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up tracing/filters fix from the urgent queue,
              we will queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ftrace.c
kernel/trace/trace_events_filter.c