Merge branch 'regmap-asoc' into for-3.2

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

Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)

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

Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/Kconfig
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)
		1	2
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history