Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass',...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:45:07 +0000 (14:45 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:45:07 +0000 (14:45 +0100)

Trivial merge