Merge remote-tracking branches 'asoc/topic/cx20442' and 'asoc/topic/davinci' into...
authorMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:56 +0000 (19:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:56 +0000 (19:48 +0100)

Trivial merge