]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'imx-mxs/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:55 +0000 (11:48 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:55 +0000 (11:48 +0200)
commit2ea6d86a4d22fe80ec7e618635bd353918694de6
treecbdde07c1ee724b7d23d4e2f4355136d2f9a5df6
parent5f6578e103c70725ca60b41f0d4d81dac4986bfa
parente37856fdefe11737e1fb33a39d95487fb9d0e5f5
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx6q.c
Documentation/devicetree/bindings/vendor-prefixes.txt
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