Merge remote-tracking branch 'battery/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 02:40:25 +0000 (13:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 02:40:25 +0000 (13:40 +1100)

Trivial merge