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

author Mark Brown <broonie@kernel.org>

Sun, 24 Jul 2016 21:07:41 +0000 (22:07 +0100)

committer Mark Brown <broonie@kernel.org>

Sun, 24 Jul 2016 21:07:41 +0000 (22:07 +0100)
author Mark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:07:41 +0000 (22:07 +0100)
committer Mark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:07:41 +0000 (22:07 +0100)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/codecs/rt5514.c
Simple merge
diff --cc sound/soc/codecs/rt5514.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sun, 24 Jul 2016 21:07:41 +0000 (22:07 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 24 Jul 2016 21:07:41 +0000 (22:07 +0100)
		1	2	3	4	5
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/rt5514.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/rt5514.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history