Merge branch 'linus' into perfcounters/core
[pandora-kernel.git] / arch / x86 / include / asm / socket.h
1 #include <asm-generic/socket.h>