]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'depends/gpio' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Sat, 23 Jul 2011 11:18:28 +0000 (13:18 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 23 Jul 2011 11:18:28 +0000 (13:18 +0200)
commit529dad2831ac0813f0b0f81eff1a3b804616a704
tree17981bf34fb5c2aa840ed852b4e0468a07c853e1
parent6c8e075a28e7b8f9dd460b16439e637427492323
parent752ad5e82dfd83851e44a2b9da8761994cd7e61c
Merge branch 'depends/gpio' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into for-next

Conflicts:
arch/arm/mach-imx/mm-imx1.c
arch/arm/mach-imx/mm-imx21.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx27.c
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c
arch/arm/mach-mx5/mm.c
14 files changed:
arch/arm/mach-ep93xx/core.c
arch/arm/mach-imx/mm-imx21.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx27.c
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c
arch/arm/mach-mx5/mm.c
arch/arm/mach-omap1/gpio15xx.c
arch/arm/mach-omap1/gpio16xx.c
arch/arm/mach-omap1/gpio7xx.c
drivers/gpio/gpio-langwell.c
drivers/gpio/gpio-omap.c
drivers/gpio/gpio-tps65910.c
drivers/leds/Kconfig