]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:38:37 +0000 (10:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:38:37 +0000 (10:38 +1000)
1  2 
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/mtdoops.c

Simple merge
Simple merge
Simple merge
Simple merge