Merge commit 'v2.6.29-rc8' into tracing/ftrace
[linux-2.6] / arch / m68k / include / asm / ftrace.h
1 /* empty */