Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / arch / x86 / include / asm / socket.h
1 #include <asm-generic/socket.h>