Merge branch 'linus' into core/softlockup
[linux-2.6] / arch / mips / sgi-ip27 / ip27-nmi.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2