Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 5a7d8a28
    Linus Torvalds authored
    Pull MIPS updates from Ralf Baechle:
     "This has been sitting in -next for a while with no objections and all
      MIPS defconfigs except one are building fine; that one platform got
      broken by another patch in your tree and I'm going to submit a patch
      separately.
    
       - a handful of fixes that didn't make 3.11
       - a few bits of Octeon 3 support with more to come for a later
         release
       - platform enhancements for Octeon, ath79, Lantiq, Netlogic and
         Ralink SOCs
       - a GPIO driver for the Octeon
       - some dusting off of the DECstation code
       - the usual dose of cleanups"
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (65 commits)
      MIPS: DMA: Fix BUG due to smp_processor_id() in preemptible code
      MIPS: kexec: Fix random crashes while loading crashkernel
      MIPS: kdump: Skip walking indirection page for crashkernels
      MIPS: DECstation HRT calibration bug fixes
      MIPS: Export copy_from_user_page() (needed by lustre)
      MIPS: Add driver for the built-in PCI controller of the RT3883 SoC
      MIPS: DMA: For BMIPS5000 cores flush region just like non-coherent R10000
      MIPS: ralink: Add support for reset-controller API
      MIPS: ralink: mt7620: Add cpu-feature-override header
      MIPS: ralink: mt7620: Add spi clock definition
      MIPS: ralink: mt7620: Add wdt clock definition
      MIPS: ralink: mt7620: Improve clock frequency detection
      MIPS: ralink: mt7620: This SoC has EHCI and OHCI hosts
      MIPS: ralink: mt7620: Add verbose ram info
      MIPS: ralink: Probe clocksources from OF
      MIPS: ralink: Add support for systick timer found on newer ralink SoC
      MIPS: ralink: Add support for periodic timer irq
      MIPS: Netlogic: Built-in DTB for XLP2xx SoC boards
      MIPS: Netlogic: Add support for USB on XLP2xx
      MIPS: Netlogic: XLP2xx update for I2C controller
      ...
    5a7d8a28