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)
commit307367eaffc8638e10ba1784fc66bfe623ae79e2
tree087641ed4c29320f8759cda28e377e36ff82cb78
parenta4fb5df214c7e8d5bc949c1068d92252f105427a
parentaee0013e53b339a573e2a8d66062fe87765aa3bd
Merge branch 'master' of git://denx.de/git/u-boot-imx
arch/arm/Kconfig
common/Makefile
tools/imximage.c