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

..

arc

…

arm

Merge remote-tracking branch 'u-boot-imx/master'

2014-10-08 21:20:49 +02:00

avr32

…

blackfin

…

m68k

…

microblaze

…

mips

…

nds32

…

nios2

…

openrisc

…

powerpc

Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

2014-09-26 09:57:52 -04:00

sandbox

…

sh

…

sparc

…

x86

…

.gitignore

…

Kconfig

…