Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core
[linux-2.6] / include / asm-frv / ftrace.h
1 /* empty */