Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <[email protected]>
Fri, 13 May 2016 13:22:41 +0000 (14:22 +0100)
committerMark Brown <[email protected]>
Fri, 13 May 2016 13:22:41 +0000 (14:22 +0100)

Trivial merge