Merge remote-tracking branch 'regulator/topic/core' into regulator-next
authorMark Brown <[email protected]>
Fri, 5 Dec 2014 11:14:34 +0000 (11:14 +0000)
committerMark Brown <[email protected]>
Fri, 5 Dec 2014 11:14:34 +0000 (11:14 +0000)

Trivial merge