]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'imx-mxs/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:00:55 +0000 (15:00 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:00:55 +0000 (15:00 +0200)
commit9b2e64d10c26128c796884787e02cfab3767b6db
tree78d8005b78253d56a52dcda0c01903fc91aefea6
parent7bad59cc58562dd24b8d79cf1a1d80a589948b5b
parent2f2a88f3b823f63a6fb627b9695b501de32a30ee
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/Kconfig.debug
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx23.dtsi
arch/arm/boot/dts/imx28-evk.dts
arch/arm/boot/dts/imx28.dtsi
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-imx/mach-pcm037.c
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h