• Linus Torvalds's avatar
    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8f59ae06
    Linus Torvalds authored
    Pull ARM SoC fixes from Arnd Bergmann:
     "A few patches have come up since the merge window.  The largest one is
      a rewrite of the PXA lubbock/mainstone IRQ handling.  This was already
      broken in 2011 by a change to the GPIO code and only noticed now.
      The other changes contained here are:
      MAINTAINERS file updates:
       - Ray Jui and Scott Branden are now co-maintainers for some of the
         mach-bcm chips, while Christian Daudt and Marc Carino have stepped
       - Andrew Victor is no longer maintaining at91.  Instead, Alexandre
         Belloni now becomes an official maintainer, after having done a
         bulk of the work for a while.
       - Baruch Siach, who added the mach-digicolor platform in 4.1 is now
         listed as maintainer
       - The git URL for mach-socfpga has changed
      Bug fixes:
       - Three bug fixes for new rockchip rk3288 code
       - A regression fix to make SD card support work on certain ux500
       - multiple smaller dts fixes for imx, omap, mvebu, and shmobile
       - a regression fiix for omap3 power consumption
       - a fix for regression in the ARM CCI bus driver
      Configuration changes:
       - more imx platforms are now enabled in multi_v7_defconfig"
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
      MAINTAINERS: add Conexant Digicolor machines entry
      MAINTAINERS: socfpga: update the git repo for SoCFPGA
      ARM: multi_v7_defconfig: Select more FSL SoCs
      MAINTAINERS: replace an AT91 maintainer
      drivers: CCI: fix used_mask init in validate_group()
      bus: omap_l3_noc: Fix master id address decoding for OMAP5
      bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
      ARM: dts: dra7: Fix efuse register size for ABB
      ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
      ARM: dts: am57xx-beagle-x15: Switch UART mux pins
      ARM: dts: am437x-sk: reduce col-scan-delay-us
      ARM: dts: am437x-sk: fix for new newhaven display module revision
      ARM: dts: am57xx-beagle-x15: Fix RTC aliases
      ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
      ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
      ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
      ARM: dts: OMAP3-N900: Add microphone bias voltages
      ARM: OMAP2+: Fix omap off idle power consumption creeping up
      MAINTAINERS: Update brcmstb entry
      MAINTAINERS: Remove Christian Daudt for mach-bcm