Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi', 'asoc...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:54:15 +0000 (15:54 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:54:15 +0000 (15:54 +0100)

Trivial merge