Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
authorMark Brown <broonie@kernel.org>
Thu, 8 Jan 2015 19:54:56 +0000 (19:54 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 8 Jan 2015 19:54:56 +0000 (19:54 +0000)
Conflicts:
sound/soc/fsl/fsl_ssi.c


Trivial merge