Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@ti.com>
Tue, 25 Jun 2013 02:27:44 +0000 (22:27 -0400)
committerTom Rini <trini@ti.com>
Tue, 25 Jun 2013 02:27:44 +0000 (22:27 -0400)

Trivial merge