From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 18 Apr 2011 17:07:43 +0000 (+0100)
Subject: ASoC: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Tag: v3.0-rc1~347^2~1^2~68
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5381e42f64ca19f05c5799ffae5708acb6ed411;p=pandora-kernel.git

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c
---

d5381e42f64ca19f05c5799ffae5708acb6ed411
Reading git-diff-tree failed