Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-arm26 / ipc.h
1 #include <asm-generic/ipc.h>