Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic...

author Mark Brown <[email protected]>

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

committer Mark Brown <[email protected]>

Sun, 24 Jul 2016 21:07:35 +0000 (22:07 +0100)
author Mark Brown <[email protected]>
Sun, 24 Jul 2016 21:07:35 +0000 (22:07 +0100)
committer Mark Brown <[email protected]>
Sun, 24 Jul 2016 21:07:35 +0000 (22:07 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Mark Brown <[email protected]>
	Sun, 24 Jul 2016 21:07:35 +0000 (22:07 +0100)
committer	Mark Brown <[email protected]>
	Sun, 24 Jul 2016 21:07:35 +0000 (22:07 +0100)
		1	2	3	4	5
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history