Merge remote-tracking branch 'asoc/fix/core' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Apr 2013 17:00:28 +0000 (18:00 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Apr 2013 17:00:28 +0000 (18:00 +0100)

Trivial merge