u-boot/arch/arm
Albert ARIBAUD 519fdde9e6 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
2014-04-08 09:25:08 +02:00
..
cpu Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-04-08 09:25:08 +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 Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-04-08 09:25:08 +02:00
include/asm Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-04-08 09:25:08 +02:00
lib Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-04-08 09:25:08 +02:00
config.mk build:arm: Remove setting of CROSS_COMPILE environment variable 2014-04-07 20:04:36 +02:00