tree f441f9070639e08734de38180027c6a32ebe6c53
parent cd619e21ea468b02af9eeed75eae2307ec7de1cb
parent 1b4676330aa6782bd73ec24cb4896467475f29f5
author Linus Torvalds <torvalds@linux-foundation.org> 1379281552 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1379281552 -0400

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "These are four patches for three construction sites:

   - Fix register decoding for the combination of multi-core processors
     and multi-threading.

   - Two more fixes that are part of the ongoing DECstation resurrection
     work.  One of these touches a DECstation-only network driver.

   - Finally Markos' trivial build fix for the AP/SP support.

  (With this applied now all MIPS defconfigs are building again)"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: kernel: vpe: Make vpe_attrs an array of pointers.
  MIPS: Fix SMP core calculations when using MT support.
  MIPS: DECstation I/O ASIC DMA interrupt handling fix
  MIPS: DECstation HRT initialization rearrangement