Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Jun 2011 14:07:42 +0000 (15:07 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Jun 2011 14:07:42 +0000 (15:07 +0100)
1  2 
sound/soc/soc-dapm.c

Simple merge