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