]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'imx-mxs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:48:08 +0000 (09:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:48:08 +0000 (09:48 +1000)
1  2 
arch/arm/boot/dts/Makefile
arch/arm/configs/multi_v7_defconfig
arch/arm/mach-imx/Kconfig

Simple merge
Simple merge
Simple merge