Merge remote-tracking branch 'asoc/topic/fsl' into tmp
authorMark Brown <broonie@linaro.org>
Fri, 30 Aug 2013 10:04:23 +0000 (11:04 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 30 Aug 2013 10:04:23 +0000 (11:04 +0100)

Trivial merge