]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 30 Jun 2014 21:00:34 +0000 (23:00 +0200)
1  2 
arch/arm/imx-common/Makefile
arch/arm/include/asm/imx-common/iomux-v3.h
boards.cfg
include/configs/gw_ventana.h

Simple merge
diff --cc boards.cfg
Simple merge
Simple merge