u-boot-brain/board/freescale/vf610twr
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
..
imximage.cfg Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04: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 board: arm: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
vf610twr.c Merge remote-tracking branch 'u-boot-imx/master' 2014-10-08 21:20:49 +02:00