• Arnd Bergmann's avatar
    Merge branch 'drivers/mmc' into next/dt2 · deb88cc3
    Arnd Bergmann authored
    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: default avatarArnd Bergmann <arnd@arndb.de>
    deb88cc3
tegra-trimslice.dts 6.15 KB