f9fb33112b773e56905d189909e35b0
parent d524e03207591a6de7e6b5069aabc778e3f0f5f8
parent c3706f005c3aaf570e71f0f083fdbb59a5a9fa2e
author Ingo Molnar <mingo@elte.hu> 1234343033 +0100
committer Ingo Molnar <mingo@elte.hu> 1234343033 +0100

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace