tree c332ce67ef065978b07a889109394fda421c0581
parent e2b8b2808538a91444e78c7db5a30519cadd09b2
parent 80370cb758e7ca2692cd9fb5e413d970b1f4b2b2
author Ingo Molnar <mingo@elte.hu> 1236800843 +0100
committer Ingo Molnar <mingo@elte.hu> 1236800843 +0100

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