Merge branch 'x86/core' into tracing/textedit
[linux-2.6] / include / asm-frv / ftrace.h
1 /* empty */