]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'imx/imx6q' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 15:04:51 +0000 (17:04 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 15:04:51 +0000 (17:04 +0200)
commit323ba6fe0adb011c5c4f2b24ad61593748a575b5
tree8ec5e6d428a6dd276d364b8f6b6645596cb54493
parent7cf44701aa9cdbef4cc3a39b16254e4e7e235dc6
parent94460af87dd640af38aa587485f4f88026da268b
Merge branch 'imx/imx6q' into next/soc

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/Makefile
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mm/Kconfig
arch/arm/plat-mxc/include/mach/gpio.h