Merge remote-tracking branches 'asoc/topic/nau8824', 'asoc/topic/omap', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Sun, 30 Apr 2017 13:16:18 +0000 (22:16 +0900)

committer Mark Brown <broonie@kernel.org>

Sun, 30 Apr 2017 13:16:18 +0000 (22:16 +0900)
author Mark Brown <broonie@kernel.org>
Sun, 30 Apr 2017 13:16:18 +0000 (22:16 +0900)
committer Mark Brown <broonie@kernel.org>
Sun, 30 Apr 2017 13:16:18 +0000 (22:16 +0900)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sun, 30 Apr 2017 13:16:18 +0000 (22:16 +0900)
committer	Mark Brown <broonie@kernel.org>
	Sun, 30 Apr 2017 13:16:18 +0000 (22:16 +0900)
		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