From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 14 May 2012 20:35:04 +0000 (+0200)
Subject: Merge branch 'drivers/mmc' into next/dt2
X-Git-Tag: v3.5-rc1~69^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb88cc3c69975cbd9875ed9fac259b351f6b64d;p=pandora-kernel.git

Merge branch 'drivers/mmc' into next/dt2

Changes in the dt2 branch move stuff around that gets changed
in the drivers/mmc branch. I chose a non-obvious resolution by
adding the new bus-width property into all the tegra sdhci device
nodes.

Conflicts:
	arch/arm/boot/dts/tegra-cardhu.dts
	arch/arm/boot/dts/tegra-harmony.dts
	arch/arm/boot/dts/tegra-ventana.dts

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

deb88cc3c69975cbd9875ed9fac259b351f6b64d
Reading git-diff-tree failed