git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit

projects / mirror_ubuntu-zesty-kernel.git / commit

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

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>

ubuntu-zesty-kernel mirror

RSS Atom

arch/arm/boot/dts/imx53-smd.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx6q-arm2.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra-cardhu.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra-harmony.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra-paz00.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra-seaboard.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra-trimslice.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra-ventana.dts	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-esdhc-imx.c	diff1 \|	diff2 \|	blob \| history