Merge by hand (conflicts in sr.c)
[pandora-kernel.git] / include / asm-sh / ipc.h
1 #include <asm-generic/ipc.h>