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)
commit2c36c2ce00987a416bf75681742617a0f85335eb
tree0669957e2da32769647c687b735fd334a14c52cd
parentddee627cf6bb601aa980104fc17d4f84201380be
parent4b80b8c2eee5282dab57f094fd3893c0c09f750c
Merge branch 'for-3.0' into for-3.1
sound/soc/soc-dapm.c