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
..
Kconfig	kconfig: remove redundant "string" type in arch and board Kconfigs	2014-09-13 16:43:55 -04:00
MAINTAINERS	imx: Fix warning by building vf610twr_nand	2014-09-17 11:01:56 +02:00
Makefile	…
imximage.cfg	…
vf610twr.c	Merge remote-tracking branch 'u-boot-imx/master'	2014-10-08 21:20:49 +02:00