tree a0d49f301ef9067879eac5194a028288a641a1cd
parent 65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1308041510 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1308041510 +0100

ASoC: Fix mismerge with release branch

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>