• Linus Torvalds's avatar
    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4bde23f8
    Linus Torvalds authored
    Pull arm-soc fixes from Olof Johansson:
     "This is a first pass of some of the merge window fallout for ARM
      platforms.
    
      Nothing controversial:
       - A system.h fallout fix for OMAP
       - PXA fixes for breakage caused by the regulator struct changes
       - GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
       - A mismerge in our arm-soc tree of an lpc32xx change for networking
       - A fix for USB setup on tegra
       - An undo of __init annotation of display mux setup on OMAP that's
         needed at runtime"
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: pxa: fix build issue on stargate2
      ARM: pxa: fix build issue on cm-x300
      ARM: pxa: fix build failure for regulator consumer in em-x270.c
      ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
      ARM: OMAP: pm: fix compilation break
      ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
      drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
      ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
      ARM: pxa: fix regulator related build fail in magician_defconfig
      ARM: tegra: Fix device tree AUXDATA for USB/EHCI
      ARM: OMAP2+: Remove __init from DSI mux functions
    4bde23f8
stargate2.c 23.6 KB