]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'imx-mxs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:22:26 +0000 (16:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:22:26 +0000 (16:22 +1000)
commit12ebd2b7311c694aca5dd6a6ef678b6defb9155b
tree5802662c9a43c55352f930942f463a8bb2d1d23b
parentaa0948fad0fbdf275c791c1c16c4f8efc788a2d7
parent01ff97e84ff4712503b8e03dd41d5dd79b67c9e5
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/Kconfig.debug
arch/arm/mach-mxs/mach-mxs.c
arch/arm/Kconfig.debug
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx28.dtsi
arch/arm/boot/dts/imx6dl.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mm-imx3.c
arch/arm/mach-mxs/Kconfig
arch/arm/mach-mxs/mach-mxs.c
drivers/bus/Kconfig
drivers/bus/Makefile