]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6fca21d13bdf1669f61abdcf1423b4f2413ef950
tree80f46fb70b96a599594da114a3dac85a4a234ccb
parent3964089cab10498850bfdfaab5822725cb3df861
ASoC: Fix multi-component mismerge in WM8523

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/wm8523.c