Merge branch 'master'
[sfrench/cifs-2.6.git] / include / asm-ppc / traps.h
1 #include <asm-m68k/traps.h>