Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 16:15:13 +0000 (12:15 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 16:15:13 +0000 (12:15 -0400)
commite536ab8849b2b4f6d68bbc8e1d1f9bc033db06bd
treee5e3a3d5a0bee8a1d9a74deb3990455c40ded6b1
parentcc555bd4f40a652471df4a3621d45ee57df0ca11
parent205d58699b157df75f1aa0b363ea9c21add21a0c
Merge branch 'master' of git://denx.de/git/u-boot-imx
arch/arm/Kconfig
include/configs/gw_ventana.h
include/configs/nitrogen6x.h
include/configs/tqma6.h