tree 5713aaad7c95ca810c91fe104407a06b7e4bc4bf
parent a1be621dfacbef0fd374d8acd553d71e07bf29ac
parent 2cadf9135eb3b6d84b6427314be827ddd443c308
author Ingo Molnar <mingo@elte.hu> 1236161742 +0100
committer Ingo Molnar <mingo@elte.hu> 1236161742 +0100

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