Merge branch 'x86/core' into tracing/textedit
[cascardo/linux.git] / arch / cris / include / asm / ftrace.h
1 /* empty */