Merge commit 'kumar/next' into merge
[linux-2.6] / arch / um / include / asm / ftrace.h
1 /* empty */