tree d6494e409a671669614e7a08a5328e8def277225
parent 16097439703bcd38e9fe5608c12add6dacb825ea
parent 770cb24345c0f6e0d47bd2b94aa6d67bea6f8b54
author Ingo Molnar <mingo@elte.hu> 1236336037 +0100
committer Ingo Molnar <mingo@elte.hu> 1236336037 +0100

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