Merge remote-tracking branch 'asoc/topic/da7219' into asoc-next

author Mark Brown <broonie@kernel.org>

Mon, 26 Oct 2015 02:16:02 +0000 (11:16 +0900)

committer Mark Brown <broonie@kernel.org>

Mon, 26 Oct 2015 02:16:02 +0000 (11:16 +0900)
author Mark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:02 +0000 (11:16 +0900)
committer Mark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:02 +0000 (11:16 +0900)
diff --cc MAINTAINERS
Simple merge
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 26 Oct 2015 02:16:02 +0000 (11:16 +0900)
committer	Mark Brown <broonie@kernel.org>
	Mon, 26 Oct 2015 02:16:02 +0000 (11:16 +0900)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history