Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[linux-2.6] / arch / cris / include / asm / ftrace.h
1 /* empty */