From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 16 Apr 2012 18:40:27 +0000 (+0100)
Subject: ASoC: Merge tag 'v3.4-rc3' into for-3.5
X-Git-Tag: v3.5-rc1~118^2~3^2~92
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5efccd5b6843c504042735c1e20d9252daefd98;p=pandora-kernel.git

ASoC: Merge tag 'v3.4-rc3' into for-3.5

Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.

Conflicts:
	sound/soc/soc-core.c
	sound/soc/tegra/tegra_i2s.c
	sound/soc/tegra/tegra_spdif.c
---

d5efccd5b6843c504042735c1e20d9252daefd98
Reading git-diff-tree failed