]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 Oct 2012 00:10:17 +0000 (11:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 Oct 2012 00:10:17 +0000 (11:10 +1100)

Trivial merge