]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a511fa1 47e1931)
Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 11 Aug 2009 12:19:09 +0000 (14:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 11 Aug 2009 12:19:09 +0000 (14:19 +0200)
commit7e242a13bf6f2311a6d037eb12cef3bfa346b2e1
treee65b1f3d4c751baa840efc81bc4734f089379eb3tree | snapshot
parenta511fa124c5fb6d58582548afc191749562a860bcommit | diff
parent47e19315241d5936678419133d92b5941d723431commit | diff
Merge branch 'linus' into tracing/core

Conflicts:
kernel/trace/trace_events_filter.c

We use the tracing/core version.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
12 files changed:
include/linux/ftrace_event.h diff1 | diff2 | blob | history
include/trace/ftrace.h diff1 | diff2 | blob | history
kernel/kprobes.c diff1 | diff2 | blob | history
kernel/trace/ftrace.c diff1 | diff2 | blob | history
kernel/trace/ring_buffer.c diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
kernel/trace/trace.h diff1 | diff2 | blob | history
kernel/trace/trace_events.c diff1 | diff2 | blob | history
kernel/trace/trace_functions_graph.c diff1 | diff2 | blob | history
kernel/trace/trace_stack.c diff1 | diff2 | blob | history
kernel/trace/trace_stat.c diff1 | diff2 | blob | history
scripts/recordmcount.pl diff1 | diff2 | blob | history
Linux Kernel Source Tree.