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
..
arc	…
arm	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-04-08 09:25:08 +02:00
avr32	…
blackfin	…
m68k	…
microblaze	…
mips	…
nds32	…
nios2	…
openrisc	…
powerpc	…
sandbox	…
sh	…
sparc	…
x86	…
.gitignore	…