When a merge does not work automatically, git prevents
[safe/jmp/linux-2.6] / ipc / compat.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2