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