Merge branch 'linus' into x86/setup-lzma
[linux-2.6] / include / linux / user.h
1 #include <asm/user.h>