Merge branch 'depends/rmk/gpio' into next/fixes
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 21:44:18 +0000 (22:44 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 21:44:18 +0000 (22:44 +0100)
commit43872fa788060eef91ae437957e0a5e39f1c56fd
treedba464da61167d84b4f7470edebd5a769a78f9ee
parent91fed558d0f33c74477569f50ed883fe6d430f1f
parentf55be1bf52aad524dc1bf556ae26c90262c87825
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>
14 files changed:
arch/arm/Kconfig
arch/arm/mach-mmp/gplugd.c
arch/arm/mach-mmp/include/mach/gpio-pxa.h
arch/arm/mach-mmp/mmp2.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-pxa/include/mach/gpio-pxa.h
arch/arm/mach-pxa/irq.c
arch/arm/mach-pxa/lpd270.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/saarb.c
drivers/gpio/gpio-pxa.c
drivers/tty/serial/atmel_serial.c