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

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