Merge branch 'master' of git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Tue, 24 Jun 2014 18:04:33 +0000 (14:04 -0400)
committerTom Rini <trini@ti.com>
Tue, 24 Jun 2014 18:04:33 +0000 (14:04 -0400)

Trivial merge