Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5677' into asoc...

author Mark Brown <[email protected]>

Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)

committer Mark Brown <[email protected]>

Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)
author Mark Brown <[email protected]>
Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)
committer Mark Brown <[email protected]>
Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/codecs/rt5640.c
Simple merge
author	Mark Brown <[email protected]>
	Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)
committer	Mark Brown <[email protected]>
	Tue, 3 Jun 2014 09:39:55 +0000 (10:39 +0100)
		1	2	3
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
sound/soc/codecs/rt5640.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history