From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Sep 2010 18:17:44 +0000 (+0100)
Subject: ASoC: Fix merge issue with WM8962 control addition
X-Git-Tag: v2.6.37-rc1~126^2~1^2~81
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f808cf8ddb5f3ca0f0271473c6c02a4b32580b;p=pandora-kernel.git

ASoC: Fix merge issue with WM8962 control addition

Let's not add the core controls twice.

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

Reading git-diff-tree failed