ftrace: fix merge

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2008-05-28 01:22:08 +02:00
commit b1829d2705