Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
[pandora-kernel.git] / include / asm-m68knommu / shmparam.h
1 #include <asm-m68k/shmparam.h>