From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 25 Sep 2007 00:32:16 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.23-rc8~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e0b9d139f2595fafbe95fcb7b40109db724900e8;p=linux-2.6-omap-h63xx.git

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.
---

e0b9d139f2595fafbe95fcb7b40109db724900e8