Merge branches 'upstream' and 'upstream-fixes' into for-linus
[linux-2.6] / include / linux / user.h
1 #include <asm/user.h>