Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 15 Oct 2009 14:02:14 +0000 (15:02 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 15 Oct 2009 14:02:14 +0000 (15:02 +0100)
1  2 
sound/soc/soc-dapm.c

Simple merge