Merge branch 'for-3.1' into for-3.2

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

Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)

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

Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)
diff --cc sound/soc/soc-cache.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)
		1	2
sound/soc/soc-cache.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	blob \| history