Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

* '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)

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/common/it8152.c
Simple merge

diff --cc arch/arm/common/vic.c
Simple merge

diff --cc arch/arm/mach-mx3/mach-mx31_3ds.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/dma.c
Simple merge

diff --cc arch/arm/plat-omap/gpio.c
index ccf2660f4151718a01562213753f4d652c6bbff1,99f57b9c7fa378ad53db97cda8feb49c7af3bd10..971d186369423c7eacb03e580a74714ad35e6f26
--- 1/arch/arm/plat-omap/gpio.c
--- 2/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@@ -756,10 -756,8 +756,10 @@@ static int gpio_irq_type(struct irq_dat
        spin_lock_irqsave(&bank->lock, flags);
        retval = _set_gpio_triggering(bank, get_gpio_index(gpio), type);
        if (retval == 0) {
-               struct irq_desc *d = irq_to_desc(irq);
 -              irq_desc[d->irq].status &= ~IRQ_TYPE_SENSE_MASK;
 -              irq_desc[d->irq].status |= type;
++              struct irq_desc *desc = irq_to_desc(d->irq);
 +
-               d->status &= ~IRQ_TYPE_SENSE_MASK;
-               d->status |= type;
++              desc->status &= ~IRQ_TYPE_SENSE_MASK;
++              desc->status |= type;
        }
        spin_unlock_irqrestore(&bank->lock, flags);
  

diff --cc arch/arm/plat-s3c24xx/devs.c
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/devs.h
Simple merge

diff --cc arch/arm/plat-samsung/pm.c
Simple merge