Merge commit 'origin/master' into next
[linux-2.6] / arch / alpha / include / asm / ftrace.h
1 /* empty */