Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:19:32 +0000 (11:19 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:19:32 +0000 (11:19 -0800)
commitd227e87e6c939c6071def92bc7691ad774c733ff
tree31fbc74974da765322b26de321e0b33f2f7e1478
parentf66d45e99eb7ca91822c3e3f6d7a98843c9626cb
parent364ca8a897eadb2f0e76b7f0ffe94168f6d83d66
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.