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)
commit2c96c142e941041973faab20ca3b82d57f435c5e
tree45188f0ecb3f4bb7408a7219f8fcd041d500235a
parent3c355863fb32070a2800f41106519c5c3038623a
parent8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab
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