Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 11 May 2013 07:25:36 +0000 (09:25 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 11 May 2013 07:25:36 +0000 (09:25 +0200)
commitec7023db8dc95966919589541f1ca09355a3f7a5
tree69be08a0b3f19e3e1d99ea7829931f8f800a01d9
parente825b100d209a9d3c79b2998452cafa94eec986a
parentd782c1fe7246301143ed78c0d86ea6c81f9325f9
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
drivers/mtd/nand/mxc_nand_spl.c
include/configs/m28evk.h
Makefile
README
boards.cfg
drivers/mtd/nand/mxc_nand_spl.c
include/configs/m28evk.h
include/configs/mx28evk.h