]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
committerSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
commit51b643b404827d8fde60d7953773a42d46ca87e0
treeae71fcbd8b3640b68fc11e1dca620a8ee96bac5f
parent554f786e284a6ce859d51f62240d615603944c8e
parent480c93df5b99699390f93a7024c9f60d09da0e96
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
kernel/trace/trace.c