]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'akpm/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 09:08:19 +0000 (19:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 09:08:19 +0000 (19:08 +1000)

Trivial merge