]> 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, 2 Dec 2011 00:55:07 +0000 (11:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 00:55:07 +0000 (11:55 +1100)
1  2 
drivers/mtd/maps/bcm963xx-flash.c

Simple merge