]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'depends/rmk/gpio' into next/devel
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:46:42 +0000 (23:46 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:46:42 +0000 (23:46 +0100)
commit4da6a4af7f6d484c2fe527f3f5453cb85f916abb
treec07af29f8baf2e6f4ed3bedbe46d405924edd530
parentdfd854c9326e39704e3609020d65cd8461864ac5
parentc0cb4132cf671b451e32dcc8b99c9dcd2961f543
Merge branch 'depends/rmk/gpio' into next/devel

Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
16 files changed:
arch/arm/Kconfig
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-davinci/da850.c
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-mmp/gplugd.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-tegra/board-trimslice-pinmux.c
arch/arm/plat-mxc/include/mach/gpio.h
drivers/gpio/gpio-tegra.c
drivers/tty/serial/atmel_serial.c