From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Feb 2012 02:35:12 +0000 (-0800)
Subject: Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
X-Git-Tag: v3.4-rc1~88^2^2~27^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533;p=pandora-kernel.git

Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c
---

fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533
Reading git-diff-tree failed