Albert ARIBAUD 05d134b084 Merge remote-tracking branch 'u-boot/master' ... Conflicts: boards.cfg Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit 6130c146) to match u-boot/master's own reformatting (commit 1b37fa83).		2014-05-20 10:05:42 +02:00
..
cpu	Merge remote-tracking branch 'u-boot-sh/rmobile'	2014-05-16 20:43:04 +02:00
dts	Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'	2014-05-16 17:56:50 +02:00
imx-common	iomux-v3: Add support for mx6sl LVE bit	2014-05-09 15:10:53 +02:00
include/asm	Merge remote-tracking branch 'u-boot/master'	2014-05-20 10:05:42 +02:00
lib	Merge remote-tracking branch 'u-boot/master'	2014-05-20 10:05:42 +02:00
config.mk	build:arm: Remove setting of CROSS_COMPILE environment variable	2014-04-07 20:04:36 +02:00