Merge branch 'for-linus' of git://www.jni.nu/cris
[linux-2.6] / include / asm-alpha / shmparam.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2