tree ceff09a936b9605011486b05aad523700202bcc4
parent 8718d75ef23e858a6b947f5b1a43094acf3b6e23
parent 7df4246117cb0adc6c3ed54bdb2d2faf4656d9cd
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1174360436 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1174360436 -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] Export except_vec_vi_{mori,lui,ori} as text symbols.
  [MIPS] mips-boards: More liberal check for mips-board console
  [MIPS] Misc fixes for plat_irq_dispatch functions
  [MIPS] Qemu: Fix Symmetric Uniprocessor support.
  [MIPS] VI: TRACE_IRQS_OFF clobbers $v0, so save & restore around call.