Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dpcm' into asoc...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:52 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:52 +0000 (18:54 +0100)

Trivial merge