]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'dmi/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Mar 2016 23:40:44 +0000 (10:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Mar 2016 23:40:44 +0000 (10:40 +1100)

Trivial merge