Merge branch 'depends/rmk/gpio' into next/board
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:46:26 +0000 (16:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:46:26 +0000 (16:46 +0200)
commit335332770c68649ffeaf5dc2b58d9cd40041e295
treea48e86b9f9a80913399a182a152b4c580a9c3836
parent3b3c281073288ebdc6161108bdc4c9f1b08bdee3
parentf55be1bf52aad524dc1bf556ae26c90262c87825
Merge branch 'depends/rmk/gpio' into next/board

Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/Kconfig
arch/arm/mach-at91/board-usb-a926x.c
arch/arm/mach-mmp/gplugd.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-tegra/board-trimslice.c
drivers/tty/serial/atmel_serial.c