Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Feb 2009 10:31:01 +0000 (11:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Feb 2009 10:31:01 +0000 (11:31 +0100)
commitf492d3f8385a98f828e8220d14492337dc29e07b
tree31f22c83f7e45388955aacb45c425d7cb6a4d78c
parentc4e2b432d5b57e2faaeea048079b31c243079647
parente110e3d1eaa0f9628918be67ddd32e8ad65a2871
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace