]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: Fix mismerge of Speyside set_bias_level_post()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Jun 2011 15:11:18 +0000 (16:11 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Jun 2011 16:51:38 +0000 (17:51 +0100)
commit170dd1f1714546ce5c0418f4c3e2d782be15eae2
tree1c0e2f3b6fc7f7c33e350f49270f4ecc8aecfe27
parent433be58ca494484a97b1a30ecd06151e363b8c90
ASoC: Fix mismerge of Speyside set_bias_level_post()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
sound/soc/samsung/speyside.c