From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 22 Nov 2010 19:11:48 +0000 (+0000)
Subject: ASoC: Fix multi-component mismerge in WM8523
X-Git-Tag: v2.6.37-rc4~14^2^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71a4734b1ad7edccbfd9bd395df328ebbd94287;p=pandora-kernel.git

ASoC: Fix multi-component mismerge in WM8523

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
---

Reading git-diff-tree failed