tree c81354a509d6962f6878145fcf3cdbe50a000a89
parent 03418c7efaa429dc7647ac93e3862e3fe1816873
parent 62524d55e5b9ffe36e3bf3dd7a594114f150b449
author Ingo Molnar <mingo@elte.hu> 1237355996 +0100
committer Ingo Molnar <mingo@elte.hu> 1237355996 +0100

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