]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 00:40:35 +0000 (11:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 00:40:35 +0000 (11:40 +1100)
1  2 
drivers/mtd/maps/pxa2xx-flash.c
drivers/mtd/nand/mpc5121_nfc.c

Simple merge
Simple merge