From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Apr 2013 19:23:12 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: Ubuntu-5.0.0-8.9~14008
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6cfa92382e5f11be0bdb5ced62ed249004708f6c;p=mirror_ubuntu-disco-kernel.git

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.
---

6cfa92382e5f11be0bdb5ced62ed249004708f6c