Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/topology', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:52 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:52 +0000 (00:23 +0000)

Trivial merge