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)
commit37ffffb98d78c46c840fa6e3c835d915c4247827
tree9ecc87c3bdb7b3c821798fee7ef64bf73a5e597f
parentade8bc14ad419f698406b162c9c5dfeee7406b4c
parentf3b4bc458de3285a04c5f60df6372ad5ca79fa60
Merge branch 'master' of git://git.denx.de/u-boot-ti
include/configs/am335x_evm.h