]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Feb 2016 23:21:08 +0000 (10:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Feb 2016 23:21:08 +0000 (10:21 +1100)

Trivial merge