u-boot-brain/arch/arm
Stefano Babic 1cad23c5f4 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>
2014-04-04 11:35:30 +02:00
..
cpu Merge branch 'master' of git://git.denx.de/u-boot-arm into master 2014-04-04 11:35:30 +02:00
dts Merge branch 'master' of git://git.denx.de/u-boot-arm into master 2014-04-04 11:35:30 +02:00
imx-common imx: add rules for U-Boot DTB support 2014-04-02 10:45:35 +02:00
include/asm Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-03-25 10:53:15 +01:00
lib ahci-plat: Provide a weak scsi_init hook 2014-03-10 13:50:31 -04:00
config.mk Merge branch 'master' of git://git.denx.de/u-boot-arm into master 2014-04-04 11:35:30 +02:00