ASoC: Fix mismerge with release branch
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 Jun 2011 08:51:50 +0000 (09:51 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 Jun 2011 08:51:50 +0000 (09:51 +0100)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

No differences found