Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <[email protected]>
Tue, 12 Jan 2016 18:26:02 +0000 (18:26 +0000)
committerMark Brown <[email protected]>
Tue, 12 Jan 2016 18:26:02 +0000 (18:26 +0000)

Trivial merge