Merge branch 'linus' into x86/doc
[linux-2.6] / arch / m68knommu / include / asm / shm.h
1 #include <asm-m68k/shm.h>