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)
1  2 
include/configs/omap3_beagle.h

Simple merge