Merge branch 'merge-fixes' into devel
[linux-2.6] / include / linux / user.h
1 #include <asm/user.h>