tree f07e901b7c3cde77f78a6b66c07b581f484d1f30
parent 00fa6fe963a97cc95e80a39a34a790bdce06cb4c
parent 80fa8181aabeb10389c8810f97e2737eb084ce8f
author Linus Torvalds <torvalds@linux-foundation.org> 1365189792 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1365189792 -0700

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

Pull MIPS fixes from Ralf Baechle:
 "Fixes for a number of small glitches in various corners of the MIPS
  tree.  No particular areas is standing out.

  With this applied all MIPS defconfigs are building fine.  No merge
  conflicts are expected."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Delete definition of SA_RESTORER.
  MIPS: Fix ISA level which causes secondary cache init bypassing and more
  MIPS: Fix build error cavium-octeon without CONFIG_SMP
  MIPS: Kconfig: Rename SNIPROM too
  MIPS: Alchemy: Fix typo "CONFIG_DEBUG_PCI"
  MIPS: Unbreak function tracer for 64-bit kernel.