Merge branch 'master' into 85xx
[linux-2.6] / include / asm-ppc / amigayle.h
1 #include <asm-m68k/amigayle.h>