Merge branch 'for-3.1' into for-3.2

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
diff --cc sound/soc/fsl/fsl_dma.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
		1	2
sound/soc/fsl/fsl_dma.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history