Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5514', 'asoc/topic...

author Mark Brown <[email protected]>

Wed, 28 Mar 2018 02:30:24 +0000 (10:30 +0800)

committer Mark Brown <[email protected]>

Wed, 28 Mar 2018 02:30:24 +0000 (10:30 +0800)
author Mark Brown <[email protected]>
Wed, 28 Mar 2018 02:30:24 +0000 (10:30 +0800)
committer Mark Brown <[email protected]>
Wed, 28 Mar 2018 02:30:24 +0000 (10:30 +0800)
diff --cc sound/soc/codecs/rt298.c
Simple merge
diff --cc sound/soc/codecs/rt5514-spi.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 28 Mar 2018 02:30:24 +0000 (10:30 +0800)
committer	Mark Brown <[email protected]>
	Wed, 28 Mar 2018 02:30:24 +0000 (10:30 +0800)
		1	2	3	4	5	6
sound/soc/codecs/rt298.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/rt5514-spi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history