tree 45acaa8fe5e620cbf734bdbeb5d48121daa65d0e
parent 22de89b371a18086162eacd9f8c960299334ab01
parent 5087f8d2a2f2daff5a913d72d8ea3ad601948e10
author Ingo Molnar <mingo@elte.hu> 1237540513 +0100
committer Ingo Molnar <mingo@elte.hu> 1237540513 +0100

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