Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 30 May 2013 10:58:37 +0000 (11:58 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 30 May 2013 10:58:37 +0000 (11:58 +0100)

Trivial merge