Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 00:07:41 +0000 (11:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 00:07:41 +0000 (11:07 +1100)

Trivial merge