From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 5 Apr 2010 18:19:32 +0000 (+0100)
Subject: Merge branch 'for-2.6.34' into for-2.6.35
X-Git-Tag: v2.6.35-rc1~478^2^2~62
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53a61d967a480307db4c8f7950ddb8bb1a0fda9b;p=pandora-kernel.git

Merge branch 'for-2.6.34' into for-2.6.35

Conflicts due to context changes next to the backported DMA data change:
	include/sound/soc.h
---

53a61d967a480307db4c8f7950ddb8bb1a0fda9b
Reading git-diff-tree failed