]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx/soc' into for-next
authorShawn Guo <shawn.guo@freescale.com>
Wed, 25 Jun 2014 16:24:38 +0000 (00:24 +0800)
committerShawn Guo <shawn.guo@freescale.com>
Wed, 25 Jun 2014 16:24:38 +0000 (00:24 +0800)
1  2 
arch/arm/configs/imx_v6_v7_defconfig
arch/arm/mach-imx/clk-imx6sl.c

Simple merge
Simple merge