Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/doc' into asoc...
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:57 +0000 (15:52 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:57 +0000 (15:52 +0000)

Trivial merge