Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
[linux-2.6] / include / asm-m68knommu / shm.h
1 #include <asm-m68k/shm.h>