Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
[linux-2.6] / arch / um / include / asm / ftrace.h
1 /* empty */