Merge branch 'topic/digital-mixing' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
commite4aa8dd5cadca054a807278b04f67ce8e3b9dc42
tree8186e049749d630b0be359cd5310bbe44675fd92
parent239a22aaa9d4d574d397b852652684ac610d1e1b
parent59ae07a58012a96cfbc9b4c0f3a07ad07d2a2208
Merge branch 'topic/digital-mixing' into for-2.6.32
include/sound/soc-dapm.h
sound/soc/codecs/wm8993.c
sound/soc/soc-dapm.c