Albert ARIBAUD 4b19b7448e Merge remote-tracking branch 'u-boot-imx/master' ... The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c		2014-10-08 21:20:49 +02:00
..
cpu	Merge remote-tracking branch 'u-boot-imx/master'	2014-10-08 21:20:49 +02:00
dts	Merge branch 'master' of git://git.denx.de/u-boot-arm	2014-09-17 18:01:04 -04:00
imx-common	ARM: mx6: Prevent overflow in DRAM size detection	2014-08-20 12:21:57 +02:00
include/asm	Merge remote-tracking branch 'u-boot-imx/master'	2014-10-08 21:20:49 +02:00
lib	armv8/fsl-lsch3: Release secondary cores from boot hold off with Boot Page	2014-09-25 08:36:19 -07:00
config.mk	kconfig: delete redundant CONFIG_${ARCH} definition	2014-07-30 14:42:02 -04:00
Kconfig	Merge remote-tracking branch 'u-boot-imx/master'	2014-10-08 21:20:49 +02:00