• Linus Torvalds's avatar
    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 2432cbe4
    Linus Torvalds authored
    Pull MIPS fixes from Ralf Baechle:
     "Random fixes across the MIPS tree.  The two hotspots are several bugs
      in the module loader and the ath79 SOC support; also noteworthy is the
      restructuring of the code to synchronize CPU timers across CPUs on
      startup; the old code recently ceased to work due to unrelated
      changes.
    
      All except one of these patches have sat for a significant time in
      linux-next for testing."
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
      MIPS: pci-ar724x: avoid data bus error due to a missing PCIe module
      MIPS: Malta: Delete duplicate PCI fixup.
      MIPS: ath79: don't hardcode the unavailability of the DSP ASE
      MIPS: Synchronize MIPS count one CPU at a time
      MIPS: BCM63xx: Fix SPI message control register handling for BCM6338/6348.
      MIPS: Module: Deal with malformed HI16/LO16 relocation sequences.
      MIPS: Fix race condition in module relocation code.
      MIPS: Fix memory leak in error path of HI16/LO16 relocation handling.
      MIPS: MTX-1: Add udelay to mtx1_pci_idsel
      MIPS: ath79: select HAVE_CLK
      MIPS: ath79: Use correct IRQ number for the OHCI controller on AR7240
      MIPS: ath79: Fix number of GPIO lines for AR724[12]
      MIPS: Octeon: Fix broken interrupt controller code.
    2432cbe4
spi-bcm63xx.c 12.4 KB