Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2008 21:11:43 +0000 (14:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2008 21:11:43 +0000 (14:11 -0700)
commite105eabb5b843c6c59f921f54122221f82ca09e6
treeb020c0e348cf858466a57bb21dd343b40bd405d4
parent1db9b8373821f200dd71f4896ca7323c371620fe
parent8531a35e5e275b17c57c39b7911bc2b37025f28c
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