Merge remote-tracking branch 'regulator/topic/constraints' into regulator-next
authorMark Brown <[email protected]>
Mon, 2 Jun 2014 16:08:01 +0000 (17:08 +0100)
committerMark Brown <[email protected]>
Mon, 2 Jun 2014 16:08:01 +0000 (17:08 +0100)

Trivial merge