Merge remote-tracking branch 'regulator/fix/core' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 15 Jan 2013 00:38:27 +0000 (09:38 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 15 Jan 2013 00:38:27 +0000 (09:38 +0900)

Trivial merge