Merge remote-tracking branch 'asoc/topic/fsl' into tmp
authorMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 20:15:52 +0000 (21:15 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 20:15:52 +0000 (21:15 +0100)

Trivial merge