Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus

author Mark Brown <[email protected]>

Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)

committer Mark Brown <[email protected]>

Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
author Mark Brown <[email protected]>
Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
committer Mark Brown <[email protected]>
Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
diff --cc sound/soc/codecs/cs42l52.h
Simple merge
diff --cc sound/soc/codecs/wm5110.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
committer	Mark Brown <[email protected]>
	Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
		1	2
sound/soc/codecs/cs42l52.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm5110.c	patch \|	diff1 \|	diff2 \|	blob \| history