Merge branch 'next' into for-linus
[linux-2.6] / arch / m68knommu / include / asm / sockios.h
1 #include <asm-m68k/sockios.h>