From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 14 Jun 2011 08:51:50 +0000 (+0100)
Subject: ASoC: Fix mismerge with release branch
X-Git-Tag: v3.1-rc1~271^2~2^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=169d5a83f687c37104d51cbaa639bdffca8a1cd3;p=pandora-kernel.git

ASoC: Fix mismerge with release branch

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

Reading git-diff-tree failed