Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[linux-2.6] / include / asm-m68knommu / socket.h
1 #include <asm-m68k/socket.h>