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