]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'uml/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 23:48:18 +0000 (10:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 23:48:18 +0000 (10:48 +1100)

Trivial merge