Merge remote-tracking branch 'regulator/fix/core' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 Mar 2013 02:12:20 +0000 (10:12 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 Mar 2013 02:12:20 +0000 (10:12 +0800)

Trivial merge