]> err.no Git - linux-2.6/commit
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)
commitb1829d2705daa7cb72eb1e08bdc8b7e9fad34266
tree2be273d7b2902ee3b789c63337437c65479f4660
parent492a7ea5bcf263ee02a9eb6a3ab0222a1946fade
ftrace: fix merge

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/ftrace.h