Merge remote-tracking branch 'regulator/topic/core' into regulator-next
authorMark Brown <[email protected]>
Mon, 22 Jun 2015 10:19:51 +0000 (11:19 +0100)
committerMark Brown <[email protected]>
Mon, 22 Jun 2015 10:19:51 +0000 (11:19 +0100)

Trivial merge