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