u-boot/board/congatec
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
..
cgtqmx6eval Merge remote-tracking branch 'u-boot-imx/master' 2014-10-08 21:20:49 +02:00