Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git] / include / asm-ppc / traps.h
1 #include <asm-m68k/traps.h>