Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Jan 2013 13:59:37 +0000 (14:59 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Jan 2013 13:59:37 +0000 (14:59 +0100)
commit7528cf5f016b5b8b8b12b373f6f31a10bf89233d
treede91b38f0b5a9c06c2000b02372a7cc1c2655e3e
parent79f38777947ac7685e2cef8bd977f954ab198c0e
parent1411fb37b5a8d56bececc5e6ea09d2e0670b9810
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
include/configs/m28evk.h
include/image.h