Merge branch 'master' of git://git.denx.de/u-boot-74xx-7xx
authorTom Rini <trini@ti.com>
Tue, 11 Jun 2013 22:11:47 +0000 (18:11 -0400)
committerTom Rini <trini@ti.com>
Tue, 11 Jun 2013 22:11:47 +0000 (18:11 -0400)

Trivial merge