Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes ... This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2011-10-31 22:44:18 +01:00
..
include/plat	Merge branch 'depends/rmk/gpio' into next/fixes	2011-10-31 22:44:18 +01:00
dma.c	arch/arm/plat-pxa/dma.c: correct NULL test	2010-05-01 11:33:00 +01:00
Kconfig	[ARM] pxa: move ssp into common plat-pxa	2010-05-11 17:24:58 +02:00
Makefile	ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem	2011-10-01 23:41:41 +01:00
mfp.c	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
pwm.c	ARM: pxa: Make id const in pwm_probe()	2010-08-30 09:59:44 +08:00
ssp.c	arm/pxa2xx: reorgazine SSP and SPI header files	2010-12-01 12:18:33 +01:00