Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/fsl-ssi', 'asoc/fix...
authorMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:15 +0000 (14:26 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:15 +0000 (14:26 +0100)

Trivial merge