Merge branch 'topic/digital-mixing' into for-2.6.32

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

Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)

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

Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
diff --cc include/sound/soc-dapm.h
Simple merge
diff --cc sound/soc/codecs/wm8993.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
		1	2
include/sound/soc-dapm.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8993.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	blob \| history