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

Pull MIPS updates from Ralf Baechle:
 "MIPS updates:

   - All the things that didn't make 3.10.
   - Removes the Windriver PPMC platform.  Nobody will miss it.
   - Remove a workaround from kernel/irq/irqdomain.c which was there
     exclusivly for MIPS.  Patch by Grant Likely.
   - More small improvments for the SEAD 3 platform
   - Improvments on the BMIPS / SMP support for the BCM63xx series.
   - Various cleanups of dead leftovers.
   - Platform support for the Cavium Octeon-based EdgeRouter Lite.

  Two large KVM patchsets didn't make it for this pull request because
  their respective authors are vacationing"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits)
  MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER
  MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions
  MIPS: SEAD3: Disable L2 cache on SEAD-3.
  MIPS: BCM63xx: Enable second core SMP on BCM6328 if available
  MIPS: BCM63xx: Add SMP support to prom.c
  MIPS: define write{b,w,l,q}_relaxed
  MIPS: Expose missing pci_io{map,unmap} declarations
  MIPS: Malta: Update GCMP detection.
  Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET"
  MIPS: APSP: Remove <asm/kspd.h>
  SSB: Kconfig: Amend SSB_EMBEDDED dependencies
  MIPS: microMIPS: Fix improper definition of ISA exception bit.
  MIPS: Don't try to decode microMIPS branch instructions where they cannot exist.
  MIPS: Declare emulate_load_store_microMIPS as a static function.
  MIPS: Fix typos and cleanup comment
  MIPS: Cleanup indentation and whitespace
  MIPS: BMIPS: support booting from physical CPU other than 0
  MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS
  MIPS: GIC: Fix gic_set_affinity infinite loop
  MIPS: Don't save/restore OCTEON wide multiplier state on syscalls.
  ...

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/bcm63xx/boards/board_bcm963xx.c
Simple merge

diff --cc arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
Simple merge

diff --cc arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
Simple merge

diff --cc arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
Simple merge

diff --cc arch/mips/kernel/scall32-o32.S
Simple merge

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/edac/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
index fdc2ab4af315f75fd7b23360af9c60783a18214f,a8fff7700624c9b24f60d44809d61bb30aff0816..dc6dea614abd68dca0e32f7d6948b9c8e40696ef
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -727,19 -724,9 +727,19 @@@ config I2C_VERSATIL
          This driver can also be built as a module.  If so, the module
          will be called i2c-versatile.
  
 +config I2C_WMT
 +      tristate "Wondermedia WM8xxx SoC I2C bus support"
 +      depends on ARCH_VT8500
 +      help
 +        Say yes if you want to support the I2C bus on Wondermedia 8xxx-series
 +        SoCs.
 +
 +        This driver can also be built as a module. If so, the module will be
 +        called i2c-wmt.
 +
  config I2C_OCTEON
        tristate "Cavium OCTEON I2C bus support"
-       depends on CPU_CAVIUM_OCTEON
+       depends on CAVIUM_OCTEON_SOC
        help
          Say yes if you want to support the I2C serial bus on Cavium
          OCTEON SOC.

diff --cc drivers/net/phy/Kconfig
Simple merge

diff --cc drivers/rapidio/switches/idt_gen2.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge

diff --cc include/uapi/linux/Kbuild
Simple merge

diff --cc kernel/irq/irqdomain.c
index 2d7cd342836526a1eaa4c767dadd351dee83c71c,a341b3d433ad7eb8216b3630bbfa6aa8b9da4d5a..706724e9835dc07f72ca1bc21b1cba0bf86f5d65
--- 1/kernel/irq/irqdomain.c
--- 2/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@@ -475,20 -665,8 +475,8 @@@ unsigned int irq_create_of_mapping(stru
  
        domain = controller ? irq_find_host(controller) : irq_default_domain;
        if (!domain) {
- #ifdef CONFIG_MIPS
-               /*
-                * Workaround to avoid breaking interrupt controller drivers
-                * that don't yet register an irq_domain.  This is temporary
-                * code. ~~~gcl, Feb 24, 2012
-                *
-                * Scheduled for removal in Linux v3.6.  That should be enough
-                * time.
-                */
-               if (intsize > 0)
-                       return intspec[0];
- #endif
 -              pr_warning("no irq domain found for %s !\n",
 -                         of_node_full_name(controller));
 +              pr_warn("no irq domain found for %s !\n",
 +                      of_node_full_name(controller));
                return 0;
        }
  

diff --cc lib/Kconfig.debug
Simple merge