]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ubifs/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 01:05:34 +0000 (11:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 01:05:34 +0000 (11:05 +1000)
1  2 
drivers/mtd/ubi/block.c

Simple merge