Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a
authorMark Brown <broonie@kernel.org>
Tue, 1 May 2018 21:12:18 +0000 (06:12 +0900)
committerMark Brown <broonie@kernel.org>
Tue, 1 May 2018 21:12:18 +0000 (06:12 +0900)
conflict between a fix and new development in mtk


Trivial merge