]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 13:26:47 +0000 (14:26 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 13:26:47 +0000 (14:26 +0100)
1  2 
drivers/mtd/nand/nandsim.c

Simple merge