Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <[email protected]>
Fri, 6 Mar 2015 21:10:28 +0000 (21:10 +0000)
committerMark Brown <[email protected]>
Fri, 6 Mar 2015 21:10:28 +0000 (21:10 +0000)

Trivial merge