Merge branch 'linus' into x86/mm
[pandora-kernel.git] / arch / um / include / asm / ftrace.h
1 /* empty */