Merge remote-tracking branch 'asoc/fix/fsl' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Jan 2013 08:26:21 +0000 (16:26 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Jan 2013 08:26:21 +0000 (16:26 +0800)

Trivial merge