Merge branch 'topic/vmaster-update' into topic/docbook-fix
[linux-2.6] / include / linux / user.h
1 #include <asm/user.h>