Merge branch 'asoc-4.17' into asoc-4.18 n810 dependencies
authorMark Brown <broonie@kernel.org>
Fri, 27 Apr 2018 10:58:05 +0000 (11:58 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 Apr 2018 10:58:05 +0000 (11:58 +0100)

Trivial merge