From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 7 Jul 2009 18:18:46 +0000 (+0100)
Subject: Merge branch 'davinci' into for-2.6.32
X-Git-Tag: v2.6.32-rc1~166^2~83^2~81
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef;p=pandora-kernel.git

Merge branch 'davinci' into for-2.6.32

Conflicts:
	sound/soc/davinci/davinci-i2s.c
---

3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef
Reading git-diff-tree failed