Merge branch 'master' into upstream-fixes
[cascardo/linux.git] / include / asm-i386 / mach-default / mach_traps.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2