Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Jan 2011 13:22:14 +0000 (13:22 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Jan 2011 13:22:14 +0000 (13:22 +0000)
1  2 
sound/soc/soc-dapm.c

Simple merge