ftrace: fix merge
authorIngo Molnar <mingo@elte.hu>
Tue, 27 May 2008 23:22:08 +0000 (01:22 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 27 May 2008 23:25:04 +0000 (01:25 +0200)
Signed-off-by: Ingo Molnar <mingo@elte.hu>

No differences found