Merge branch 'asoc-4.17' into asoc-4.18 to get adau17x1 changes so
authorMark Brown <broonie@kernel.org>
Mon, 16 Apr 2018 11:58:21 +0000 (12:58 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 16 Apr 2018 11:58:21 +0000 (12:58 +0100)
further patches can be applied.

1  2 
sound/soc/sh/rcar/core.c

Simple merge