• Linus Torvalds's avatar
    Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm · 16c10203
    Linus Torvalds authored
    * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits)
      ARM: pxa: fix building issue of missing physmap.h
      ARM: mmp: PXA910 drive strength FAST using wrong value
      ARM: mmp: MMP2 drive strength FAST using wrong value
      ARM: pxa: fix recursive calls in pxa_low_gpio_chip
      AT91: Support for gsia18s board
      AT91: Acme Systems FOX Board G20 board files
      AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
      ARM: pxa: fix suspend/resume array index miscalculation
      ARM: pxa: use cpu_has_ipr() consistently in irq.c
      ARM: pxa: remove unused variable in clock-pxa3xx.c
      ARM: pxa: fix warning in zeus.c
      ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
      ARM mxs: clkdev related compile fixes
      ARM i.MX mx31_3ds: Fix MC13783 regulator names
      ARM: plat-stmp3xxx: irq_data conversion.
      ARM: plat-spear: irq_data conversion.
      ARM: plat-orion: irq_data conversion.
      ARM: plat-omap: irq_data conversion.
      ARM: plat-nomadik: irq_data conversion.
      ARM: plat-mxc: irq_data conversion.
      ...
    
    Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert
    Buytenhek's irq_data conversion clashing with some omap irq updates)
    16c10203
gpio.c 53 KB