tag 55881f63ea93d223b26e92bb156b974d11e43a83
tagger Olof Johansson <olof@lixom.net> Mon May 21 00:19:09 2012 -0700
object deb88cc3c69975cbd9875ed9fac259b351f6b64d

arm-soc: device tree conversions, part 2

These continue the device tree work from part 1, this set is for the
tegra, mxs and imx platforms, all of which have dependencies on clock
or pinctrl changes submitted earlier.

commit deb88cc3c69975cbd9875ed9fac259b351f6b64d
author Arnd Bergmann <arnd@arndb.de> Mon May 14 22:35:04 2012 +0200
committer Arnd Bergmann <arnd@arndb.de> Tue May 15 13:44:11 2012 +0200
tree ece2ffba5c3e585cf649d73e4ea1784037335468
parent ecf1b318347f6c250293ee8a9f2597373b00e0c3
parent 7f217794ffa72f208a250b79ab0b7ea3de19677f

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>