Merge branch 'topic/digital-mixing' into for-2.6.32
Mark Brown [Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)]
1  2 
include/sound/soc-dapm.h
sound/soc/codecs/wm8993.c
sound/soc/soc-dapm.c

Simple merge
Simple merge
Simple merge