Merge branch 'asoc-4.19' into asoc-4.20 tas dependency

author Mark Brown <[email protected]>

Fri, 31 Aug 2018 15:23:43 +0000 (16:23 +0100)

committer Mark Brown <[email protected]>

Fri, 31 Aug 2018 15:23:43 +0000 (16:23 +0100)
author Mark Brown <[email protected]>
Fri, 31 Aug 2018 15:23:43 +0000 (16:23 +0100)
committer Mark Brown <[email protected]>
Fri, 31 Aug 2018 15:23:43 +0000 (16:23 +0100)
diff --cc sound/soc/codecs/rt5682.c
Simple merge
diff --cc sound/soc/codecs/tas6424.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 31 Aug 2018 15:23:43 +0000 (16:23 +0100)
committer	Mark Brown <[email protected]>
	Fri, 31 Aug 2018 15:23:43 +0000 (16:23 +0100)
		1	2
sound/soc/codecs/rt5682.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/tas6424.c	patch \|	diff1 \|	diff2 \|	blob \| history