Merge branch 'master' of git://git.denx.de/u-boot-ti
authorTom Rini <trini@ti.com>
Mon, 2 Feb 2015 17:37:34 +0000 (12:37 -0500)
committerTom Rini <trini@ti.com>
Mon, 2 Feb 2015 17:37:34 +0000 (12:37 -0500)
1  2 
include/configs/am335x_evm.h

Simple merge