From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Oct 2008 21:11:43 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v3.12-rc1~18276
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e105eabb5b843c6c59f921f54122221f82ca09e6;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] SMTC: Fix SMTC dyntick support.
  [MIPS] SMTC: Close tiny holes in the SMTC IPI replay system.
  [MIPS] SMTC: Fix holes in SMTC and FPU affinity support.
  [MIPS] SMTC: Build fix: Fix filename in Makefile
  [MIPS] Build fix: Fix irq flags type
---

e105eabb5b843c6c59f921f54122221f82ca09e6