merge Linus head tree into my drm tree and fix up conflicts
[linux-2.6] / include / asm-mips / ipc.h
1 #include <asm-generic/ipc.h>