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

Trivial merge