Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Oct 2009 09:36:28 +0000 (10:36 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Oct 2009 09:36:28 +0000 (10:36 +0100)
1  2 
sound/soc/codecs/wm8940.c
sound/soc/soc-dapm.c

Simple merge
Simple merge