Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commite0b9d139f2595fafbe95fcb7b40109db724900e8
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 25 Sep 2007 00:32:16 +0000 (24 17:32 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 25 Sep 2007 00:32:16 +0000 (24 17:32 -0700)
tree4fafc9622d913ea1398b4471ed6f6ce9b38cab1d
parent4f33e21c923c1656fb9e3d6fe2302e34e9e079a4
parent1146fe30504a1edd8a434f500e1be139492570c9
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] SMTC: Make ack_bad_irq() safe with no IM backstop.