ASoC: Fix multi-component mismerge in WM8523
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Nov 2010 19:11:48 +0000 (19:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Nov 2010 20:27:49 +0000 (20:27 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

No differences found