author Mark Brown 1290453108 +0000 committer Mark Brown 1290457669 +0000 ASoC: Fix multi-component mismerge in WM8523 Signed-off-by: Mark Brown Acked-by: Liam Girdwood Că„