Merge branch 'linus' into perfcounters/core-v2
[linux-2.6] / arch / um / include / asm / ftrace.h
1 /* empty */