Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Thu, 22 May 2014 18:29:41 +0000 (14:29 -0400)
committerTom Rini <trini@ti.com>
Thu, 22 May 2014 18:29:41 +0000 (14:29 -0400)
commitf6ed9d50949eb290744bf7606e30763582e2d44b
tree659cd954a4b4075c7227ea6d1d6ec768b0a2d78a
parent8e3812859670fda61b98458864fa9f014fcd3dcc
parent05d134b084590684bcf4d832c0035952727b7cd9
Merge branch 'master' of git://git.denx.de/u-boot-arm
include/configs/omap3_beagle.h