From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Jan 2011 20:33:40 +0000 (-0800)
Subject: Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.38-rc1~38
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=16c1020362083b320868c0deef492249089c3cd3

Merge branch 'devel-stable' of /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)
---

16c1020362083b320868c0deef492249089c3cd3
diff --cc arch/arm/plat-omap/gpio.c
index ccf2660f4151,99f57b9c7fa3..971d18636942
--- a/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);