]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'akpm/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 04:47:41 +0000 (15:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 04:47:41 +0000 (15:47 +1100)

Trivial merge