tree b020c0e348cf858466a57bb21dd343b40bd405d4
parent 1db9b8373821f200dd71f4896ca7323c371620fe
parent 8531a35e5e275b17c57c39b7911bc2b37025f28c
author Linus Torvalds <torvalds@linux-foundation.org> 1223068303 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223068303 -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: 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