Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Wed, 2 Oct 2013 15:45:22 +0000 (11:45 -0400)
committerTom Rini <trini@ti.com>
Wed, 2 Oct 2013 15:45:22 +0000 (11:45 -0400)
1  2 
README
boards.cfg
include/configs/am335x_evm.h

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