]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 21:55:31 +0000 (22:55 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 21:55:31 +0000 (22:55 +0100)
commite2b8b2808538a91444e78c7db5a30519cadd09b2
tree60c45581817db746bd61670f5c95b19c2661daa0
parent4dd163a0512eb91bbcf4e66d2f65b8e4042561b3
parentef18012b248b47ec9a12c3a83ca5e99782d39c5d
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
kernel/trace/blktrace.c
kernel/trace/trace.c
kernel/trace/trace_functions_graph.c
kernel/trace/trace_workqueue.c