From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 23 Jan 2007 19:19:32 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v3.12-rc1~31889
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d227e87e6c939c6071def92bc7691ad774c733ff;p=kernel%2Fkernel-generic.git

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Vr41xx: Fix after GENERIC_HARDIRQS_NO__DO_IRQ change
  [MIPS] SMTC: Instant IPI replay.
---

d227e87e6c939c6071def92bc7691ad774c733ff