Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 14:54:28 +0000 (15:54 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 14:54:28 +0000 (15:54 +0100)

Trivial merge