From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 8 Jun 2011 15:11:18 +0000 (+0100)
Subject: ASoC: Fix mismerge of Speyside set_bias_level_post()
X-Git-Tag: v3.1-rc1~271^2~2^2~79
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995e54f5fe4606043e695cd3327b18fcfc88bc62;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed