Merge branch 'master' of git://git.denx.de/u-boot-arm into master
authorStefano Babic <sbabic@denx.de>
Fri, 4 Apr 2014 09:35:30 +0000 (11:35 +0200)
committerStefano Babic <sbabic@denx.de>
Fri, 4 Apr 2014 09:35:30 +0000 (11:35 +0200)
commit1cad23c5f471d695bed1e3907e30caee3c2a3056
tree34e035df5db9b327aeae36eff9d0645a915e3177
parent5dd73bc0a40a4b318195eab871a1f535aad6b43b
parent00b132bf34c5be86a108ac7fe8231ad9e97f6de4
Merge branch 'master' of git://git.denx.de/u-boot-arm into master

Conflicts:
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>
Makefile
arch/arm/config.mk
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
arch/arm/dts/Makefile
drivers/misc/Makefile
drivers/pci/pcie_imx.c
include/configs/m53evk.h
include/configs/mx53loco.h
include/configs/nitrogen6x.h