From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 21 Apr 2011 11:00:27 +0000 (+0100)
Subject: Merge branch 'tegra' into for-2.6.40
X-Git-Tag: v3.0-rc1~347^2~1^2~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843;p=pandora-kernel.git

Merge branch 'tegra' into for-2.6.40

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig
---

a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843
Reading git-diff-tree failed