Merge branch 'regulator-4.17' into regulator-4.18 merge window
authorMark Brown <[email protected]>
Fri, 8 Jun 2018 15:27:56 +0000 (16:27 +0100)
committerMark Brown <[email protected]>
Fri, 8 Jun 2018 15:27:56 +0000 (16:27 +0100)

Trivial merge