Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl', 'asoc/fix/omap...
authorMark Brown <broonie@linaro.org>
Mon, 27 Jan 2014 18:18:36 +0000 (18:18 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 27 Jan 2014 18:18:36 +0000 (18:18 +0000)

Trivial merge