Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)
committerTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:06:51 +0000 (11:06 -0400)
1  2 
README
arch/arm/Kconfig
common/board_f.c

diff --cc README
Simple merge
Simple merge
Simple merge