Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/psc-ac97' and 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:52 +0000 (12:12 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:52 +0000 (12:12 +0100)

Trivial merge