Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Nov 2009 13:37:04 +0000 (13:37 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Nov 2009 13:37:04 +0000 (13:37 +0000)
commit97cef58521288ade8d957e4d568a3d409dea7d64
treeda15a7d4741ff4a1651e205d72e2be717116e347
parentdcdec639ad74f20427df82284f98b68f6ac7c0ae
parent50b6bce59d154b5db137907a5c0ed45a4e7a3829
Merge branch 'for-2.6.32' into for-2.6.33
sound/soc/soc-dapm.c