Merge remote-tracking branch 'u-boot-imx/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 8 Oct 2014 19:20:49 +0000 (21:20 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 8 Oct 2014 19:20:49 +0000 (21:20 +0200)
commit4b19b7448e63bab8af17abbb30acff00d8f0dc99
tree6ba89c10ebffb00cee92656da9a5aad8396390c0
parentc19a8bc5711ec63e905ef91f045a1489f0aa3cb0
parent5e3a388cddce1685ccd9bc1b58ddb89a191ed88f
Merge remote-tracking branch 'u-boot-imx/master'

The single file conflict below is actually trivial.

Conflicts:
board/boundary/nitrogen6x/nitrogen6x.c
arch/arm/Kconfig
board/boundary/nitrogen6x/nitrogen6x.c
board/freescale/mx6qsabreauto/mx6qsabreauto.c
board/freescale/vf610twr/vf610twr.c
drivers/mtd/nand/Makefile
include/configs/mx6slevk.h
include/configs/nitrogen6x.h