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