tree 4fafc9622d913ea1398b4471ed6f6ce9b38cab1d
parent 4f33e21c923c1656fb9e3d6fe2302e34e9e079a4
parent 1146fe30504a1edd8a434f500e1be139492570c9
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190680336 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190680336 -0700

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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