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