Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)
committerTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:40:43 +0000 (10:40 -0500)
1  2 
arch/arm/Kconfig
common/Makefile
tools/imximage.c

Simple merge
diff --cc common/Makefile
Simple merge
Simple merge