Merge by hand (whitespace conflicts in libata.h)
[linux-2.6] / include / linux / user.h
1 #include <asm/user.h>