git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c35586 8ad8073)
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)
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>
1  2 
kernel/trace/ftrace.c patch | diff1 | diff2 | blob | history
kernel/trace/trace_events_filter.c patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/ftrace.c
Simple merge
diff --cc kernel/trace/trace_events_filter.c
Simple merge
Full containers within linux kernel