Merge branch 'master' of git://git.infradead.org/~dedekind/ubi-2.6
[linux-2.6] / include / asm-ppc / traps.h
1 #include <asm-m68k/traps.h>