Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)
committerTom Rini <trini@ti.com>
Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)
1  2 
config.mk
include/configs/am335x_evm.h

diff --cc config.mk
Simple merge
Simple merge