merge Linus head tree into my drm tree and fix up conflicts
[linux-2.6] / include / linux / user.h
1 #include <asm/user.h>