Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/mc13783', 'asoc/fix...
authorMark Brown <broonie@kernel.org>
Tue, 12 May 2015 19:31:33 +0000 (20:31 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 12 May 2015 19:31:33 +0000 (20:31 +0100)

Trivial merge