Merge remote-tracking branches 'asoc/fix/rockchip', 'asoc/fix/rt5645', 'asoc/fix...
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:51:26 +0000 (16:51 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:51:26 +0000 (16:51 +0100)

Trivial merge