Merge branch 'for-2.6.29' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Jan 2009 15:02:08 +0000 (15:02 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Jan 2009 15:02:08 +0000 (15:02 +0000)
commit2d663963dd915c1a342a03c820b648bd5f06b6a7
tree3805c6ed9f376e66802ece5dc496e7e770fdbfcb
parentef963dcf6879e500e6559b4327f6cbdc4439198e
parent43d50807dbf47a139f83660fec14aebe936b3c80
Merge branch 'for-2.6.29' into for-2.6.30
include/sound/soc-dapm.h