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

author Mark Brown <[email protected]>

Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)

committer Mark Brown <[email protected]>

Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
author Mark Brown <[email protected]>
Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
committer Mark Brown <[email protected]>
Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
diff --cc sound/soc/codecs/max98090.c
Simple merge
diff --cc sound/soc/codecs/wm8962.c
Simple merge
diff --cc sound/soc/intel/sst-haswell-pcm.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
committer	Mark Brown <[email protected]>
	Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
		1	2
sound/soc/codecs/max98090.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8962.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/sst-haswell-pcm.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	blob \| history