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