| commit | f71a4734b1ad7edccbfd9bd395df328ebbd94287 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Nov 22 19:11:48 2010 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Nov 22 20:27:49 2010 +0000 |
| tree | 80f46fb70b96a599594da114a3dac85a4a234ccb | |
| parent | b3915d1fb6557dda206f4644ba9aa96ffd9a99d2 [diff] |
ASoC: Fix multi-component mismerge in WM8523 Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>