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

Trivial merge