Merge branch 'linus' into sched/urgent
[linux-2.6] / include / asm-ppc / traps.h
1 #include <asm-m68k/traps.h>