Merge remote-tracking branches 'asoc/topic/ad193x' and 'asoc/topic/arizona' into...

author Mark Brown <[email protected]>

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

committer Mark Brown <[email protected]>

Mon, 26 Oct 2015 02:15:58 +0000 (11:15 +0900)
author Mark Brown <[email protected]>
Mon, 26 Oct 2015 02:15:58 +0000 (11:15 +0900)
committer Mark Brown <[email protected]>
Mon, 26 Oct 2015 02:15:58 +0000 (11:15 +0900)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Mark Brown <[email protected]>
	Mon, 26 Oct 2015 02:15:58 +0000 (11:15 +0900)
committer	Mark Brown <[email protected]>
	Mon, 26 Oct 2015 02:15:58 +0000 (11:15 +0900)
		1	2	3
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history