Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Apr 2014 07:25:08 +0000 (09:25 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Apr 2014 07:25:08 +0000 (09:25 +0200)
commit519fdde9e6a6ebce7dc743b4f5621503d25b7a45
tree29649f48b92b92342183f71565c34afeca0b1735
parentc71645ad2bd5179ad21e2501c26f574e9688f02a
parent04d2f0a9f33112bd70ce4d9c451fdca1682e3a59
Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
Makefile
README
arch/arm/cpu/arm926ejs/mxs/Makefile
arch/arm/imx-common/Makefile
drivers/dfu/dfu.c
include/configs/am335x_evm.h
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
include/sdhci.h