Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl', 'asoc/fix/fsl...
authorMark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)

Trivial merge