Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / user.h
1 #include <asm/user.h>