Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 16:48:38 +0000 (16:48 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 16:48:38 +0000 (16:48 +0000)
1  2 
sound/soc/soc-dapm.c

Simple merge