Merge remote-tracking branches 'asoc/topic/sunxi', 'asoc/topic/topology' and 'asoc...
authorMark Brown <broonie@kernel.org>
Sun, 13 Mar 2016 08:17:56 +0000 (15:17 +0700)
committerMark Brown <broonie@kernel.org>
Sun, 13 Mar 2016 08:17:56 +0000 (15:17 +0700)

Trivial merge