]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 00:45:52 +0000 (11:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 00:45:52 +0000 (11:45 +1100)
1  2 
arch/arm/boot/dts/spear13xx.dtsi
drivers/mtd/nand/nand_base.c

Simple merge
Simple merge